commit 6fc763e3c2b1e539510cb18ece8b97e183099ab1
author Mike Klein <mtklein@google.com> Mon Jun 23 15:29:52 2014 -0400
committer Mike Klein <mtklein@google.com> Mon Jun 23 15:29:52 2014 -0400
tree ad32c32ded50d162e35f7d4dbf7c0587b5594a8d
parent 744fb7313f31069e9eceeca4c0ff33dbe2fe1737

No one uses SkPicture::swap.

BUG=skia:
R=robertphillips@google.com

Review URL: https://codereview.chromium.org/349313004

include/core/SkPicture.h

diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index 7cba671..04b2138b 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -111,11 +111,6 @@
     virtual ~SkPicture();
 
     /**
-     *  Swap the contents of the two pictures. Guaranteed to succeed.
-     */
-    void swap(SkPicture& other);
-
-    /**
      *  Creates a thread-safe clone of the picture that is ready for playback.
      */
     SkPicture* clone() const;

src/core/SkPicture.cpp

diff --git a/src/core/SkPicture.cpp b/src/core/SkPicture.cpp
index 11afc34..c4e4204 100644
--- a/src/core/SkPicture.cpp
+++ b/src/core/SkPicture.cpp
@@ -161,17 +161,6 @@
 // fRecord OK
 SkPicture::~SkPicture() {}
 
-// fRecord OK
-void SkPicture::swap(SkPicture& other) {
-    SkTSwap(fUniqueID, other.fUniqueID);
-    SkTSwap(fWidth, other.fWidth);
-    SkTSwap(fHeight, other.fHeight);
-
-    fAccelData.swap(&other.fAccelData);
-    fPlayback.swap(&other.fPlayback);
-    fRecord.swap(&other.fRecord);
-}
-
 // fRecord TODO
 SkPicture* SkPicture::clone() const {
     SkPicture* clonedPicture = SkNEW(SkPicture);

tests/PictureTest.cpp

diff --git a/tests/PictureTest.cpp b/tests/PictureTest.cpp
index 6969524..c554a12 100644
--- a/tests/PictureTest.cpp
+++ b/tests/PictureTest.cpp
@@ -1561,16 +1561,6 @@
     SkPicture emptyCopy(empty);
     REPORTER_ASSERT(reporter, empty.uniqueID() != emptyCopy.uniqueID());
 
-    // test out swap
-    {
-        SkPicture swapWithData;
-        uint32_t beforeID1 = swapWithData.uniqueID();
-        uint32_t beforeID2 = copyWithData.uniqueID();
-        swapWithData.swap(copyWithData);
-        REPORTER_ASSERT(reporter, copyWithData.uniqueID() == beforeID1);
-        REPORTER_ASSERT(reporter, swapWithData.uniqueID() == beforeID2);
-    }
-
     // test out clone
     {
         SkAutoTUnref<SkPicture> cloneWithData(hasData->clone());