Clean up a bit after SkPictureData/SkPicturePlayback split

src/core/SkPictureData.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include <new>
 #include "SkBBoxHierarchy.h"
 #include "SkDrawPictureCallback.h"
 #include "SkPictureData.h"
 #include "SkPictureRecord.h"
 #include "SkPictureStateTree.h"
 #include "SkReadBuffer.h"
 #include "SkTypeface.h"
 #include "SkTSort.h"
 #include "SkWriteBuffer.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
 template <typename T> int SafeCount(const T* obj) {
     return obj ? obj->count() : 0;
 }
 
-/*  Define this to spew out a debug statement whenever we skip the remainder of
-    a save/restore block because a clip... command returned false (empty).
- */
-#define SPEW_CLIP_SKIPPINGx
-
 SkPictureData::SkPictureData(const SkPictInfo& info)
     : fInfo(info) {
     this->init();
 }
 
 void SkPictureData::initForPlayback() const {
     // ensure that the paths bounds are pre-computed
     if (NULL != fPathHeap.get()) {
         for (int i = 0; i < fPathHeap->count(); i++) {
             (*fPathHeap.get())[i].updateBoundsCache();
@@ skipping 625 matching lines @@
         if (!this->parseBufferTag(buffer, tag, size)) {
             return false; // we're invalid
         }
     }
     return true;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#ifdef SPEW_CLIP_SKIPPING
-struct SkipClipRec {
-    int     fCount;
-    size_t  fSize;
-
-    SkipClipRec() {
-        fCount = 0;
-        fSize = 0;
-    }
-
-    void recordSkip(size_t bytes) {
-        fCount += 1;
-        fSize += bytes;
-    }
-};
-#endif
-
-uint32_t SkPictureData::OperationList::offset(int index) const {
-    SkASSERT(index < fOps.count());
-    return ((SkPictureStateTree::Draw*)fOps[index])->fOffset;
-}
-
-const SkMatrix& SkPictureData::OperationList::matrix(int index) const {
-    SkASSERT(index < fOps.count());
-    return *((SkPictureStateTree::Draw*)fOps[index])->fMatrix;
-}
-
 const SkPicture::OperationList* SkPictureData::getActiveOps(const SkIRect& query) const {
     if (NULL == fStateTree || NULL == fBoundingHierarchy) {
         return NULL;
     }
 
-    OperationList* activeOps = SkNEW(OperationList);
+    SkPicture::OperationList* activeOps = SkNEW(SkPicture::OperationList);
 
     fBoundingHierarchy->search(query, &(activeOps->fOps));
     if (0 != activeOps->fOps.count()) {
         SkTQSort<SkPictureStateTree::Draw>(
             reinterpret_cast<SkPictureStateTree::Draw**>(activeOps->fOps.begin()),
             reinterpret_cast<SkPictureStateTree::Draw**>(activeOps->fOps.end()-1));
     }
 
     return activeOps;
 }
@@ skipping 548 matching lines @@
     for (index = 0; index < fPictureCount; index++)
         bufferPtr += snprintf(bufferPtr, DUMP_BUFFER_SIZE - (bufferPtr - pBuffer),
             "picture%p, ", fPictureRefs[index]);
     if (fPictureCount > 0)
         SkDebugf("%s0};\n", pBuffer);
 
     const_cast<SkPictureData*>(this)->dumpStream();
 }
 
 #endif