SkData -> SkPicture::SnapshotArray

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 184 matching lines @@
      *  number may be greater or less than the number of SkCanvas calls
      *  recorded: some calls may be recorded as more than one operation, or some
      *  calls may be optimized away.
      */
     int approximateOpCount() const;
 
     /** Return true if this picture contains text.
      */
     bool hasText() const;
 
+    // A refcounted array of refcounted const SkPicture pointers.
+    struct SnapshotArray : public SkNVRefCnt {
+        explicit SnapshotArray(size_t count) { fArray.setCount(count); }
+        ~SnapshotArray() { fArray.unrefAll(); }
+
+        const SkPicture*& operator[](size_t i)       { return fArray[i]; }

[reed1, 2014/11/20 20:36:47]

this looks tricky, since it allows the receiver to modify an entry. Can we
change the constructor to take ownership of an already-built array? If so, that
would more naturally look like a build -> transport pattern.

Worse case, change the method name to something like writable_set(int index,
pic*) which asserts 1 owner?

[mtklein, 2014/11/21 16:03:50]

Went with set().  I don't think we can assert single ownership... doesn't that
defeat the point of refcounting the snapshots?

+        const SkPicture*  operator[](size_t i) const { return fArray[i]; }
+        size_t count() const { return fArray.count(); }
+        const SkPicture* const* begin() const { return fArray.begin(); }
+    private:
+        SkTDArray<const SkPicture*> fArray;
+    };
+
 private:
     // V2 : adds SkPixelRef's generation ID.
     // V3 : PictInfo tag at beginning, and EOF tag at the end
     // V4 : move SkPictInfo to be the header
     // V5 : don't read/write FunctionPtr on cross-process (we can detect that)
     // V6 : added serialization of SkPath's bounds (and packed its flags tighter)
     // V7 : changed drawBitmapRect(IRect) to drawBitmapRectToRect(Rect)
     // V8 : Add an option for encoding bitmaps
     // V9 : Allow the reader and writer of an SKP disagree on whether to support
     //      SK_SUPPORT_HINTING_SCALE_FACTOR
@@ skipping 33 matching lines @@
     // Only SKPs within the min/current picture version range (inclusive) can be read.
     static const uint32_t MIN_PICTURE_VERSION = 19;
     static const uint32_t CURRENT_PICTURE_VERSION = 37;
 
     void needsNewGenID() { fUniqueID = SK_InvalidGenID; }
     void callDeletionListeners();
 
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
-    // Takes ownership of the SkRecord, refs the (optional) drawablePicts and BBH.
-    SkPicture(const SkRect& cullRect, SkRecord*, SkData* drawablePicts,
-              SkBBoxHierarchy*);
+    // Takes ownership of the SkRecord, refs the (optional) SnapshotArray and BBH.
+    SkPicture(const SkRect& cullRect, SkRecord*, SnapshotArray*, SkBBoxHierarchy*);
 
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
     static SkPictureData* Backport(const SkRecord&, const SkPictInfo&,
                                    SkPicture const* const drawablePics[], int drawableCount);
 
     // uint32_t fRefCnt; from SkNVRefCnt<SkPicture>
     mutable uint32_t fUniqueID;
     const SkRect                          fCullRect;
     mutable SkAutoTUnref<const AccelData> fAccelData;
     mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
     SkAutoTDelete<SkRecord>       fRecord;
     SkAutoTUnref<SkBBoxHierarchy> fBBH;
-    SkAutoTUnref<SkData>          fDrawablePicts;
+    SkAutoTUnref<SnapshotArray>   fDrawablePicts;
 
     // helpers for fDrawablePicts
     int drawableCount() const;
     // will return NULL if drawableCount() returns 0
     SkPicture const* const* drawablePicts() const;
 
     struct PathCounter;
 
     struct Analysis {
         Analysis() {}  // Only used by SkPictureData codepath.
@@ skipping 11 matching lines @@
     } fAnalysis;
 
     friend class SkPictureRecorder;            // SkRecord-based constructor.
     friend class GrLayerHoister;               // access to fRecord
     friend class ReplaceDraw;
     friend class SkPictureUtils;
 };
 SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
 
 #endif