SkMultiSKP: version 2

src/utils/SkMultiPictureDocumentReader.h

Index: src/utils/SkMultiPictureDocumentReader.h
diff --git a/src/utils/SkMultiPictureDocumentReader.h b/src/utils/SkMultiPictureDocumentReader.h
index 8e0a630e52e3c66f3942d12d4b53259269d1ae58..e0473a6539778fc941cf7db4dda0da850e3bf49e 100644
--- a/src/utils/SkMultiPictureDocumentReader.h
+++ b/src/utils/SkMultiPictureDocumentReader.h
@@ -22,10 +22,10 @@ public:
     /** Return to factory settings. */
     void reset() {
         fSizes.reset();
-        fOffsets.reset();
+        fPages.reset();
     }
 
-    /** Call this after calling init() */
+    /** Call this after calling init() (otherwise you'll always get zero). */
     int pageCount() const { return fSizes.count(); }
 
     /** Deserialize a page from the stream.  Call init() first.  The
@@ -39,7 +39,8 @@ public:
 
 private:
     SkTArray<SkSize> fSizes;
-    SkTArray<size_t> fOffsets;
+    size_t fOffset;
+    mutable SkTArray<sk_sp<SkPicture>> fPages;
 };
 
 #endif  // SkMultiPictureDocumentReader_DEFINED