SkPicture: try to no-op away clone().

src/core/SkPicture.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 133 matching lines @@
 }
 
 // fRecord OK
 SkPicture::~SkPicture() {
     this->callDeletionListeners();
 }
 
 #ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
 // fRecord TODO, fix by deleting this method
 SkPicture* SkPicture::clone() const {
-
+#ifdef SK_PICTURE_CLONE_NOOP
+    return SkRef(const_cast<SkPicture*>(this));
+#else
     SkAutoTDelete<SkPictureData> newData;
 
     if (fData.get()) {
         SkPictCopyInfo copyInfo;
 
         int paintCount = SafeCount(fData->fPaints);
 
         /* The alternative to doing this is to have a clone method on the paint and have it
          * make the deep copy of its internal structures as needed. The holdup to doing
          * that is at this point we would need to pass the SkBitmapHeap so that we don't
@@ skipping 32 matching lines @@
         copyInfo.controller.setupPlaybacks();
 
         newData.reset(SkNEW_ARGS(SkPictureData, (*fData, &copyInfo)));
     }
 
     SkPicture* clone = SkNEW_ARGS(SkPicture, (newData.detach(), fWidth, fHeight));
     clone->fRecordWillPlayBackBitmaps = fRecordWillPlayBackBitmaps;
     clone->fUniqueID = this->uniqueID(); // need to call method to ensure != 0
 
     return clone;
+#endif
 }
 #endif//SK_SUPPORT_LEGACY_PICTURE_CLONE
 
 // fRecord OK
 void SkPicture::EXPERIMENTAL_addAccelData(const SkPicture::AccelData* data) const {
     fAccelData.reset(SkRef(data));
 }
 
 // fRecord OK
 const SkPicture::AccelData* SkPicture::EXPERIMENTAL_getAccelData(
@@ skipping 272 matching lines @@
 // fRecord OK
 SkPicture::SkPicture(int width, int height, SkRecord* record)
     : fWidth(width)
     , fHeight(height)
     , fRecord(record)
     , fRecordWillPlayBackBitmaps(SkRecordWillPlaybackBitmaps(*record)) {
     this->needsNewGenID();
 }
 
 // Note that we are assuming that this entry point will only be called from
-// one thread. Currently the only client of this method is 
+// one thread. Currently the only client of this method is
 // SkGpuDevice::EXPERIMENTAL_optimize which should be only called from a single
 // thread.
 void SkPicture::addDeletionListener(DeletionListener* listener) const {
     SkASSERT(NULL != listener);
 
     *fDeletionListeners.append() = SkRef(listener);
 }
 
 void SkPicture::callDeletionListeners() {
     for (int i = 0; i < fDeletionListeners.count(); ++i) {
         fDeletionListeners[i]->onDeletion(this->uniqueID());
     }
 
     fDeletionListeners.unrefAll();
 }