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..de70f73d830ea301c371c2fdf8ac98568e50d328 100644
--- a/src/utils/SkMultiPictureDocumentReader.h
+++ b/src/utils/SkMultiPictureDocumentReader.h
@@ -22,7 +22,7 @@ public:
     /** Return to factory settings. */
     void reset() {
         fSizes.reset();
-        fOffsets.reset();
+        fPages.reset();
     }
 
     /** Call this after calling init() */

[tomhudson, 2016/08/23 12:12:19]

Does this mean "you must call this after calling init()"? Or "the return value
is only valid after calling init()"? Or ... ?

[hal.canary, 2016/08/23 15:53:39]

 /** Call this after calling init() (otherwise you'll always get zero). */

fixed

@@ -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