Remove SkPicture copy constructor

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 91 matching lines @@
         default:
             SkDebugf("DrawType error 0x%08x\n", drawType);
             SkASSERT(0);
             break;
     }
     SkASSERT(0);
     return NULL;
 }
 #endif
 
-#ifdef SK_DEBUG_VALIDATE
-static void validateMatrix(const SkMatrix* matrix) {
-    SkScalar scaleX = matrix->getScaleX();
-    SkScalar scaleY = matrix->getScaleY();
-    SkScalar skewX = matrix->getSkewX();
-    SkScalar skewY = matrix->getSkewY();
-    SkScalar perspX = matrix->getPerspX();
-    SkScalar perspY = matrix->getPerspY();
-    if (scaleX != 0 && skewX != 0)
-        SkDebugf("scaleX != 0 && skewX != 0\n");
-    SkASSERT(scaleX == 0 || skewX == 0);
-    SkASSERT(scaleY == 0 || skewY == 0);
-    SkASSERT(perspX == 0);
-    SkASSERT(perspY == 0);
-}
-#endif
-
-
 ///////////////////////////////////////////////////////////////////////////////
 
 // fRecord OK
 SkPicture::SkPicture()
     : fWidth(0)
     , fHeight(0)
     , fRecordWillPlayBackBitmaps(false) {
     this->needsNewGenID();
 }
 
 // fRecord OK
 SkPicture::SkPicture(int width, int height,
                      const SkPictureRecord& record,
                      bool deepCopyOps)
     : fWidth(width)
     , fHeight(height)
     , fRecordWillPlayBackBitmaps(false) {
     this->needsNewGenID();
 
     SkPictInfo info;
     this->createHeader(&info);
     fData.reset(SkNEW_ARGS(SkPictureData, (record, info, deepCopyOps)));
 }
 
-// The simplest / safest way to copy an SkRecord is to replay it into a new one.
-static SkRecord* copy(const SkRecord& src, int width, int height) {
-    SkRecord* dst = SkNEW(SkRecord);
-    SkRecorder recorder(dst, width, height);
-    SkRecordDraw(src, &recorder);
-    return dst;
-}
-
 // Create an SkPictureData-backed SkPicture from an SkRecord.
 // This for compatibility with serialization code only.  This is not cheap.
 static SkPicture* backport(const SkRecord& src, int width, int height) {
     SkPictureRecorder recorder;
     SkRecordDraw(src, recorder.beginRecording(width, height));
     return recorder.endRecording();
 }
 
 // fRecord OK
-SkPicture::SkPicture(const SkPicture& src) : INHERITED() {
-    this->needsNewGenID();
-    fWidth = src.fWidth;
-    fHeight = src.fHeight;
-    fRecordWillPlayBackBitmaps = src.fRecordWillPlayBackBitmaps;
-
-    if (NULL != src.fData.get()) {
-        fData.reset(SkNEW_ARGS(SkPictureData, (*src.fData)));
-        fUniqueID = src.uniqueID();  // need to call method to ensure != 0
-    }
-
-    if (NULL != src.fRecord.get()) {
-        fRecord.reset(copy(*src.fRecord, fWidth, fHeight));
-        fUniqueID = src.uniqueID();  // need to call method to ensure != 0
-    }
-}
-
-// fRecord OK
 SkPicture::~SkPicture() {}
 
 #ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
 // fRecord TODO, fix by deleting this method
 SkPicture* SkPicture::clone() const {
     SkPicture* clonedPicture = SkNEW(SkPicture);
     this->clone(clonedPicture, 1);
     return clonedPicture;
 }
 
@@ skipping 344 matching lines @@
 }
 
 // fRecord OK
 SkPicture::SkPicture(int width, int height, SkRecord* record)
     : fWidth(width)
     , fHeight(height)
     , fRecord(record)
     , fRecordWillPlayBackBitmaps(SkRecordWillPlaybackBitmaps(*record)) {
     this->needsNewGenID();
 }