Deprecate SkPicture::clone().

src/core/SkPicturePlayback.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <new>
 #include "SkBBoxHierarchy.h"
 #include "SkDrawPictureCallback.h"
 #include "SkPicturePlayback.h"
@@ skipping 150 matching lines @@
     if (paths != 0)
         SkDebugf("paths size %zd (paths:%d) ", pathBytes, paths);
     if (pictures != 0)
         SkDebugf("pictures size %zd (pictures:%d) ", pictureBytes, pictures);
     if (regions != 0)
         SkDebugf("regions size %zd (regions:%d) ", regionBytes, regions);
     SkDebugf("\n");
 #endif
 }
 
+#ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
 SkPicturePlayback::SkPicturePlayback(const SkPicturePlayback& src, SkPictCopyInfo* deepCopyInfo)
     : fInfo(src.fInfo) {
     this->init();
 
     fBitmapHeap.reset(SkSafeRef(src.fBitmapHeap.get()));
     fPathHeap.reset(SkSafeRef(src.fPathHeap.get()));
 
     fOpData = SkSafeRef(src.fOpData);
 
     fBoundingHierarchy = src.fBoundingHierarchy;
@@ skipping 35 matching lines @@
     fPictureRefs = SkNEW_ARRAY(const SkPicture*, fPictureCount);
     for (int i = 0; i < fPictureCount; i++) {
         if (deepCopyInfo) {
             fPictureRefs[i] = src.fPictureRefs[i]->clone();
         } else {
             fPictureRefs[i] = src.fPictureRefs[i];
             fPictureRefs[i]->ref();
         }
     }
 }
+#else

[robertphillips, 2014/06/27 18:03:50]

Do we even need this?

[mtklein, 2014/06/27 18:32:04]

Yeah, tried but failed to remove it.  We copy SkPicturePlayback in SkPicture's
copy constructor.  I do think it's worth looking into why we need to copy
pictures, but I was worried I'd lose focus to drag that in here.

+SkPicturePlayback::SkPicturePlayback(const SkPicturePlayback& src) : fInfo(src.fInfo) {
+    this->init();
+
+    fBitmapHeap.reset(SkSafeRef(src.fBitmapHeap.get()));
+    fPathHeap.reset(SkSafeRef(src.fPathHeap.get()));
+
+    fOpData = SkSafeRef(src.fOpData);
+
+    fBoundingHierarchy = src.fBoundingHierarchy;
+    fStateTree = src.fStateTree;
+    fContentInfo.set(src.fContentInfo);
+
+    SkSafeRef(fBoundingHierarchy);
+    SkSafeRef(fStateTree);
+
+    fBitmaps = SkSafeRef(src.fBitmaps);
+    fPaints = SkSafeRef(src.fPaints);
+
+    fPictureCount = src.fPictureCount;
+    fPictureRefs = SkNEW_ARRAY(const SkPicture*, fPictureCount);
+    for (int i = 0; i < fPictureCount; i++) {
+        fPictureRefs[i] = SkRef(src.fPictureRefs[i]);
+    }
+}
+#endif//SK_SUPPORT_LEGACY_PICTURE_CLONE
 
 void SkPicturePlayback::init() {
     fBitmaps = NULL;
     fPaints = NULL;
     fPictureRefs = NULL;
     fPictureCount = 0;
     fOpData = NULL;
     fFactoryPlayback = NULL;
     fBoundingHierarchy = NULL;
     fStateTree = NULL;
@@ skipping 1654 matching lines @@
     for (index = 0; index < fPictureCount; index++)
         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
             "picture%p, ", fPictureRefs[index]);
     if (fPictureCount > 0)
         SkDebugf("%s0};\n", pBuffer);
 
     const_cast<SkPicturePlayback*>(this)->dumpStream();
 }
 
 #endif