Clean up a bit after SkPictureData/SkPicturePlayback split

src/core/SkPictureData.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkPictureData_DEFINED
 #define SkPictureData_DEFINED
 
@@ skipping 142 matching lines @@
     bool containsBitmaps() const;
 
 protected:
     explicit SkPictureData(const SkPictInfo& info);
 
     bool parseStream(SkStream*, SkPicture::InstallPixelRefProc);
     bool parseBuffer(SkReadBuffer& buffer);
 
 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");
 #endif
             return fBadBitmap;
         }
         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;
         }
         return &(*fPaints)[index - 1];
     }
 
     void init();
 
 #ifdef SK_DEBUG_SIZE
 public:
@@ skipping 65 matching lines @@
     SkAutoTUnref<const SkPathHeap> fPathHeap;  // reference counted
 
     const SkPicture** fPictureRefs;
     int fPictureCount;
 
     SkBBoxHierarchy* fBoundingHierarchy;
     SkPictureStateTree* fStateTree;
 
     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;
 
     const SkPictInfo fInfo;
 
     static void WriteFactories(SkWStream* stream, const SkFactorySet& rec);
     static void WriteTypefaces(SkWStream* stream, const SkRefCntSet& rec);
 
     void initForPlayback() const;
 };
 
 #endif