Split SkPictureRangePlayback out of SkPicturePlayback

src/core/SkPicturePlayback.h

Index: src/core/SkPicturePlayback.h
diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h
index 3014b945c174fb4a6426e81802cc943c5f15a5aa..7966670f6c4255dfb753a384fee9569f0ff683c5 100644
--- a/src/core/SkPicturePlayback.h
+++ b/src/core/SkPicturePlayback.h
@@ -8,7 +8,7 @@
 #ifndef SkPicturePlayback_DEFINED
 #define SkPicturePlayback_DEFINED
 
-#include "SkTypes.h"
+#include "SkPictureFlat.h"  // for DrawType
 
 class SkBitmap;
 class SkCanvas;
@@ -22,13 +22,11 @@ public:
         : fPictureData(picture->fData.get())
         , fCurOffset(0)
         , fUseBBH(true)
-        , fStart(0)
-        , fStop(0)
         , fReplacements(NULL) {
     }
     virtual ~SkPicturePlayback() { }
 
-    void draw(SkCanvas* canvas, SkDrawPictureCallback*);
+    virtual void draw(SkCanvas* canvas, SkDrawPictureCallback*);
 
     // Return the ID of the operation currently being executed when playing
     // back. 0 indicates no call is active.
@@ -37,17 +35,6 @@ public:
 
     void setUseBBH(bool useBBH) { fUseBBH = useBBH; }
 
-    // Limit the opcode playback to be between the offsets 'start' and 'stop'.
-    // The opcode at 'start' should be a saveLayer while the opcode at
-    // 'stop' should be a restore. Neither of those commands will be issued.
-    // Set both start & stop to 0 to disable draw limiting
-    // Draw limiting cannot be enabled at the same time as draw replacing
-    void setDrawLimits(size_t start, size_t stop) {
-        SkASSERT(NULL == fReplacements);
-        fStart = start;
-        fStop = stop;
-    }
-
     // PlaybackReplacements collects op ranges that can be replaced with
     // a single drawBitmap call (using a precomputed bitmap).
     class PlaybackReplacements {
@@ -91,7 +78,6 @@ public:
     // the associated drawBitmap call
     // Draw replacing cannot be enabled at the same time as draw limiting
     void setReplacements(PlaybackReplacements* replacements) {
-        SkASSERT(fStart == 0 && fStop == 0);
         fReplacements = replacements;
     }
 
@@ -102,8 +88,6 @@ protected:
     size_t fCurOffset;
 
     bool   fUseBBH;
-    size_t fStart;
-    size_t fStop;
     PlaybackReplacements* fReplacements;
 
     void handleOp(SkReader32* reader, 
@@ -117,6 +101,21 @@ protected:
     virtual void postDraw(int opIndex) { }
 #endif
 
+    static DrawType ReadOpAndSize(SkReader32* reader, uint32_t* size);
+
+    class AutoResetOpID {
+    public:
+        AutoResetOpID(SkPicturePlayback* playback) : fPlayback(playback) { }
+        ~AutoResetOpID() {
+            if (NULL != fPlayback) {
+                fPlayback->resetOpID();
+            }
+        }
+
+    private:
+        SkPicturePlayback* fPlayback;
+    };
+
 private:
     typedef SkNoncopyable INHERITED;
 };