Split SkPictureRangePlayback out of SkPicturePlayback

src/core/SkPicturePlayback.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkCanvas.h"
 #include "SkPictureData.h"
 #include "SkPicturePlayback.h"
@@ skipping 38 matching lines @@
         if (start == fReplacements[i].fStart) {
             return &fReplacements[i];
         } else if (start < fReplacements[i].fStart) {
             return NULL;  // the ranges are monotonically increasing and non-overlapping
         }
     }
 
     return NULL;
 }
 
-
-class SkAutoResetOpID {
-public:
-    SkAutoResetOpID(SkPicturePlayback* playback) : fPlayback(playback) { }
-    ~SkAutoResetOpID() {
-        if (NULL != fPlayback) {
-            fPlayback->resetOpID();
-        }
-    }
-
-private:
-    SkPicturePlayback* fPlayback;
-};
-
 /*
-* Read the next op code and chunk size from 'reader'. The returned size
-* is the entire size of the chunk (including the opcode). Thus, the
-* offset just prior to calling read_op_and_size + 'size' is the offset
-* to the next chunk's op code. This also means that the size of a chunk
-* with no arguments (just an opcode) will be 4.
-*/
-static DrawType read_op_and_size(SkReader32* reader, uint32_t* size) {
+ * Read the next op code and chunk size from 'reader'. The returned size
+ * is the entire size of the chunk (including the opcode). Thus, the
+ * offset just prior to calling ReadOpAndSize + 'size' is the offset
+ * to the next chunk's op code. This also means that the size of a chunk
+ * with no arguments (just an opcode) will be 4.
+ */
+DrawType SkPicturePlayback::ReadOpAndSize(SkReader32* reader, uint32_t* size) {
     uint32_t temp = reader->readInt();
     uint32_t op;
     if (((uint8_t)temp) == temp) {
         // old skp file - no size information
         op = temp;
         *size = 0;
     } else {
         UNPACK_8_24(temp, op, *size);
         if (MASK_24 == *size) {
             *size = reader->readInt();
@@ skipping 23 matching lines @@
     size_t length = text->fByteLength = reader->readInt();
     text->fText = (const char*)reader->skip(length);
 }
 
 // FIXME: SkBitmaps are stateful, so we need to copy them to play back in multiple threads.
 static SkBitmap shallow_copy(const SkBitmap& bitmap) {
     return bitmap;
 }
 
 void SkPicturePlayback::draw(SkCanvas* canvas, SkDrawPictureCallback* callback) {
-    SkAutoResetOpID aroi(this);
+    AutoResetOpID aroi(this);
     SkASSERT(0 == fCurOffset);
 
     // kDrawComplete will be the signal that we have reached the end of
     // the command stream
     static const uint32_t kDrawComplete = SK_MaxU32;
 
     SkReader32 reader(fPictureData->fOpData->bytes(), fPictureData->fOpData->size());
     SkAutoTDelete<const SkPicture::OperationList> activeOpsList;
     const SkTDArray<void*>* activeOps = NULL;
 
-    // When draw limits are enabled (i.e., 0 != fStart || 0 != fStop) the state
-    // tree isn't used to pick and choose the draw operations
-    if (0 == fStart && 0 == fStop) {
-        if (fUseBBH && NULL != fPictureData->fStateTree && NULL != fPictureData->fBoundingHierarchy) {
-            SkRect clipBounds;
-            if (canvas->getClipBounds(&clipBounds)) {
-                SkIRect query;
-                clipBounds.roundOut(&query);
+    if (fUseBBH && NULL != fPictureData->fStateTree && NULL != fPictureData->fBoundingHierarchy) {
+        SkRect clipBounds;
+        if (canvas->getClipBounds(&clipBounds)) {
+            SkIRect query;
+            clipBounds.roundOut(&query);
 
-                activeOpsList.reset(fPictureData->getActiveOps(query));
-                if (NULL != activeOpsList.get()) {
-                    if (0 == activeOpsList->numOps()) {
-                        return;     // nothing to draw
-                    }
+            activeOpsList.reset(fPictureData->getActiveOps(query));
+            if (NULL != activeOpsList.get()) {
+                if (0 == activeOpsList->numOps()) {
+                    return;     // nothing to draw
+                }
 
-                    // Since the opList is valid we know it is our derived class
-                    activeOps = &(activeOpsList.get()->fOps);
-                }
+                activeOps = &(activeOpsList.get()->fOps);
             }
         }
     }
 
     SkPictureStateTree::Iterator it = (NULL == activeOps) ?
         SkPictureStateTree::Iterator() :
         fPictureData->fStateTree->getIterator(*activeOps, canvas);
 
-    if (0 != fStart || 0 != fStop) {
-        reader.setOffset(fStart);
-        uint32_t size;
-        SkDEBUGCODE(DrawType op = ) read_op_and_size(&reader, &size);
-        SkASSERT(SAVE_LAYER == op);
-        reader.setOffset(fStart + size);
-    }
-
     if (it.isValid()) {
         uint32_t skipTo = it.nextDraw();
         if (kDrawComplete == skipTo) {
             return;
         }
         reader.setOffset(skipTo);
     }
 
     // Record this, so we can concat w/ it if we encounter a setMatrix()
     SkMatrix initialMatrix = canvas->getTotalMatrix();
 
     SkAutoCanvasRestore acr(canvas, false);
 
 #ifdef SK_DEVELOPER
     int opIndex = -1;
 #endif
 
     while (!reader.eof()) {
         if (callback && callback->abortDrawing()) {
             return;
         }
 
-        if (0 != fStart || 0 != fStop) {
-            size_t offset = reader.offset();
-            if (offset >= fStop) {
-                uint32_t size;
-                SkDEBUGCODE(DrawType op = ) read_op_and_size(&reader, &size);
-                SkASSERT(RESTORE == op);
-                return;
-            }
-        }
-
         if (NULL != fReplacements) {
             // Potentially replace a block of operations with a single drawBitmap call
             SkPicturePlayback::PlaybackReplacements::ReplacementInfo* temp =
                 fReplacements->lookupByStart(reader.offset());
             if (NULL != temp) {
                 SkASSERT(NULL != temp->fBM);
                 SkASSERT(NULL != temp->fPaint);
                 canvas->save();
                 canvas->setMatrix(initialMatrix);
                 SkRect src = SkRect::Make(temp->fSrcRect);
@@ skipping 18 matching lines @@
                     uint32_t skipTo;
                     do {
                         skipTo = it.nextDraw();
                         if (kDrawComplete == skipTo) {
                             break;
                         }
 
                         if (skipTo <= temp->fStop) {
                             reader.setOffset(skipTo);
                             uint32_t size;
-                            DrawType op = read_op_and_size(&reader, &size);
+                            DrawType op = ReadOpAndSize(&reader, &size);
                             // Since we are relying on the normal SkPictureStateTree
                             // playback we need to convert any nested saveLayer calls
                             // it may issue into saves (so that all its internal
                             // restores will be balanced).
                             if (SAVE_LAYER == op) {
                                 canvas->save();
                             }
                         }
                     } while (skipTo <= temp->fStop);
 
                     if (kDrawComplete == skipTo) {
                         break;
                     }
 
                     reader.setOffset(skipTo);
                 } else {
                     reader.setOffset(temp->fStop);
                     uint32_t size;
-                    SkDEBUGCODE(DrawType op = ) read_op_and_size(&reader, &size);
+                    SkDEBUGCODE(DrawType op = ) ReadOpAndSize(&reader, &size);
                     SkASSERT(RESTORE == op);
                 }
                 continue;
             }
         }
 
         fCurOffset = reader.offset();
         uint32_t size;
-        DrawType op = read_op_and_size(&reader, &size);
+        DrawType op = ReadOpAndSize(&reader, &size);
         size_t skipTo = 0;
         if (NOOP == op) {
             // NOOPs are to be ignored - do not propagate them any further
             skipTo = fCurOffset + size;
 #ifdef SK_DEVELOPER
         } else {
             opIndex++;
             if (this->preDraw(opIndex, op)) {
                 skipTo = fCurOffset + size;
             }
@@ skipping 340 matching lines @@
         case TRANSLATE: {
             SkScalar dx = reader->readScalar();
             SkScalar dy = reader->readScalar();
             canvas->translate(dx, dy);
         } break;
         default:
             SkASSERT(0);
     }
 }