Remove Skia's use of the default SkPicture constructor and multi-clone

include/core/SkPicture.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkPicture_DEFINED
@@ skipping 45 matching lines @@
 
         // This entry point allows user's to get a unique domain prefix
         // for their keys
         static Domain GenerateDomain();
     private:
         Key fKey;
 
         typedef SkRefCnt INHERITED;
     };
 
+#ifdef SK_SUPPORT_LEGACY_DEFAULT_PICTURE_CTOR
     SkPicture();
+#endif
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     void EXPERIMENTAL_addAccelData(const AccelData*) const;
 
     /**  PRIVATE / EXPERIMENTAL -- do not call */
     const AccelData* EXPERIMENTAL_getAccelData(AccelData::Key) const;
 
     /**
      *  Function signature defining a function that sets up an SkBitmap from encoded data. On
      *  success, the SkBitmap should have its Config, width, height, rowBytes and pixelref set.
@@ skipping 28 matching lines @@
      */
     static SkPicture* CreateFromBuffer(SkReadBuffer&);
 
     virtual ~SkPicture();
 
 #ifdef SK_SUPPORT_LEGACY_PICTURE_CLONE
     /**
      *  Creates a thread-safe clone of the picture that is ready for playback.
      */
     SkPicture* clone() const;
-
-    /**
-     * Creates multiple thread-safe clones of this picture that are ready for
-     * playback. The resulting clones are stored in the provided array of
-     * SkPictures.
-     */
-    void clone(SkPicture* pictures, int count) const;
 #endif
 
     /** Replays the drawing commands on the specified canvas.
         @param canvas the canvas receiving the drawing commands.
     */
     void draw(SkCanvas* canvas, SkDrawPictureCallback* = NULL) const;
 
     /** Return the width of the picture's recording canvas. This
         value reflects what was passed to setSize(), and does not necessarily
         reflect the bounds of what has been recorded into the picture.
@@ skipping 105 matching lines @@
 
     mutable uint32_t      fUniqueID;
 
     // TODO: make SkPictureData const when clone method goes away
     SkAutoTDelete<SkPictureData> fData;
     int                   fWidth, fHeight;
     mutable SkAutoTUnref<const AccelData> fAccelData;
 
     void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
 
-    // Create a new SkPicture from an existing SkPictureData. Ref count of
-    // data is unchanged.
+    // Create a new SkPicture from an existing SkPictureData. The new picture
+    // takes ownership of 'data'.
     SkPicture(SkPictureData* data, int width, int height);
 
     SkPicture(int width, int height, const SkPictureRecord& record, bool deepCopyOps);
 
     // An OperationList encapsulates a set of operation offsets into the picture byte
     // stream along with the CTMs needed for those operation.
     class OperationList : ::SkNoncopyable {
     public:
         // The following three entry points should only be accessed if
         // 'valid' returns true.
@@ skipping 22 matching lines @@
     friend class SkPictureReplacementPlayback; // to access OperationList
 
     typedef SkRefCnt INHERITED;
 
     SkPicture(int width, int height, SkRecord*);  // Takes ownership.
     SkAutoTDelete<SkRecord> fRecord;
     bool fRecordWillPlayBackBitmaps; // TODO: const
 };
 
 #endif