Clean up a bit after SkPictureData/SkPicturePlayback split

src/core/SkPictureData.h

Index: src/core/SkPictureData.h
diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h
index 408d6358c3f6abe20fb2cb94f0a4323900249bbb..01185d644ac9e636f6c308722bab04f620d5c407 100644
--- a/src/core/SkPictureData.h
+++ b/src/core/SkPictureData.h
@@ -160,8 +160,8 @@ protected:
 
 private:
 
-    const SkBitmap& getBitmap(SkReader32& reader) const {
-        const int index = reader.readInt();
+    const SkBitmap& getBitmap(SkReader32* reader) const {
+        const int index = reader->readInt();
         if (SkBitmapHeap::INVALID_SLOT == index) {
 #ifdef SK_DEBUG
             SkDebugf("An invalid bitmap was recorded!\n");
@@ -171,19 +171,19 @@ private:
         return (*fBitmaps)[index];
     }
 
-    const SkPath& getPath(SkReader32& reader) const {
-        int index = reader.readInt() - 1;
+    const SkPath& getPath(SkReader32* reader) const {
+        int index = reader->readInt() - 1;
         return (*fPathHeap.get())[index];
     }
 
-    const SkPicture* getPicture(SkReader32& reader) const {
-        int index = reader.readInt();
+    const SkPicture* getPicture(SkReader32* reader) const {
+        int index = reader->readInt();
         SkASSERT(index > 0 && index <= fPictureCount);
         return fPictureRefs[index - 1];
     }
 
-    const SkPaint* getPaint(SkReader32& reader) const {
-        int index = reader.readInt();
+    const SkPaint* getPaint(SkReader32* reader) const {
+        int index = reader->readInt();
         if (index == 0) {
             return NULL;
         }
@@ -269,20 +269,6 @@ private:
 
     SkPictureContentInfo fContentInfo;
 
-    class OperationList : public SkPicture::OperationList {
-    public:
-        OperationList() { }
-        virtual int numOps() const SK_OVERRIDE { return fOps.count(); }
-        virtual uint32_t offset(int index) const SK_OVERRIDE;
-        virtual const SkMatrix& matrix(int index) const SK_OVERRIDE;
-
-        // The operations which are active within 'fCachedQueryRect'
-        SkTDArray<void*> fOps;
-
-    private:
-        typedef SkPicture::OperationList INHERITED;
-    };
-
     SkTypefacePlayback fTFPlayback;
     SkFactoryPlayback* fFactoryPlayback;