O(1) SkPictureUtils::ApproxBytesUsed()

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index f514828e56148e00c9f6dd5ad5f768ee2e4df773..4f44d1f5dc968047f17f38a238f1f5b22579d418 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -257,7 +257,11 @@ private:
     static bool IsValidPictInfo(const SkPictInfo& info);
 
     // Takes ownership of the SkRecord and (optional) SnapshotArray, refs the (optional) BBH.
-    SkPicture(const SkRect& cullRect, SkRecord*, SnapshotArray*, SkBBoxHierarchy*);
+    SkPicture(const SkRect& cullRect,
+             SkRecord*,
+             SnapshotArray*,
+             SkBBoxHierarchy*,
+             size_t approxBytesUsedBySubPictures);
 
     static SkPicture* Forwardport(const SkPictInfo&, const SkPictureData*);
     static SkPictureData* Backport(const SkRecord&, const SkPictInfo&,
@@ -270,6 +274,7 @@ private:
     SkAutoTUnref<const SkRecord>          fRecord;
     SkAutoTUnref<const SkBBoxHierarchy>   fBBH;
     SkAutoTDelete<const SnapshotArray>    fDrawablePicts;
+    size_t                                fApproxBytesUsedBySubPictures;

[reed1, 2015/04/21 22:13:04]

can this field be const?

[mtklein, 2015/04/21 22:18:31]

Yes, done.

 
     // helpers for fDrawablePicts
     int drawableCount() const;
@@ -299,6 +304,6 @@ private:
     friend class SkPictureUtils;
     friend class SkRecordedDrawable;
 };
-SK_COMPILE_ASSERT(sizeof(SkPicture) <= 96, SkPictureSize);
+SK_COMPILE_ASSERT(sizeof(SkPicture) <= 104, SkPictureSize);
 
 #endif