Clean up a bit after SkPictureData/SkPicturePlayback split

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index d57af50611ca3f98a25a8d5dfe218862d4ffb1b3..bcdf07a1d5f1f9efd4876a72b3bb09f6af034431 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -14,6 +14,7 @@
 #include "SkDrawPictureCallback.h"
 #include "SkImageDecoder.h"
 #include "SkRefCnt.h"
+#include "SkTDArray.h"
 
 #if SK_SUPPORT_GPU
 class GrContext;
@@ -265,11 +266,13 @@ private:
 
         // The following three entry points should only be accessed if
         // 'valid' returns true.
-        virtual int numOps() const { SkASSERT(false); return 0; };
+        virtual int numOps() const { return fOps.count(); }
         // The offset in the picture of the operation to execute.
-        virtual uint32_t offset(int index) const { SkASSERT(false); return 0; };
+        virtual uint32_t offset(int index) const;
         // The CTM that must be installed for the operation to behave correctly
-        virtual const SkMatrix& matrix(int index) const { SkASSERT(false); return SkMatrix::I(); }
+        virtual const SkMatrix& matrix(int index) const;
+
+        SkTDArray<void*> fOps;

[reed1, 2014/07/07 22:48:26]

does this guy need to be public?

[robertphillips, 2014/07/08 12:50:43]

Short term yes - without a whole lot of work. Long term, if the BBH classes
survive the transition to SkRecord then we should make this class stronger when
we update the BBH classes.

     };
 
     /** PRIVATE / EXPERIMENTAL -- do not call