| Index: src/core/SkPictureData.cpp
|
| diff --git a/src/core/SkPictureData.cpp b/src/core/SkPictureData.cpp
|
| index 877c3f4c33eaa0cece8f305e0bda6b0f96b89b3f..896c2e6bf324fcd5f17b9ed9c731fb7736086b6b 100644
|
| --- a/src/core/SkPictureData.cpp
|
| +++ b/src/core/SkPictureData.cpp
|
| @@ -46,17 +46,8 @@ SkPictureData::SkPictureData(const SkPictureRecord& record,
|
|
|
| fOpData = record.opData(deepCopyOps);
|
|
|
| - fBoundingHierarchy = record.fBoundingHierarchy;
|
| - fStateTree = record.fStateTree;
|
| -
|
| - SkSafeRef(fBoundingHierarchy);
|
| - SkSafeRef(fStateTree);
|
| fContentInfo.set(record.fContentInfo);
|
|
|
| - if (fBoundingHierarchy) {
|
| - fBoundingHierarchy->flushDeferredInserts();
|
| - }
|
| -
|
| // copy over the refcnt dictionary to our reader
|
| record.fFlattenableHeap.setupPlaybacks();
|
|
|
| @@ -98,8 +89,6 @@ void SkPictureData::init() {
|
| fTextBlobCount = 0;
|
| fOpData = NULL;
|
| fFactoryPlayback = NULL;
|
| - fBoundingHierarchy = NULL;
|
| - fStateTree = NULL;
|
| }
|
|
|
| SkPictureData::~SkPictureData() {
|
| @@ -107,8 +96,6 @@ SkPictureData::~SkPictureData() {
|
|
|
| SkSafeUnref(fBitmaps);
|
| SkSafeUnref(fPaints);
|
| - SkSafeUnref(fBoundingHierarchy);
|
| - SkSafeUnref(fStateTree);
|
|
|
| for (int i = 0; i < fPictureCount; i++) {
|
| fPictureRefs[i]->unref();
|
| @@ -578,16 +565,6 @@ bool SkPictureData::parseBuffer(SkReadBuffer& buffer) {
|
| ///////////////////////////////////////////////////////////////////////////////
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -const SkPicture::OperationList* SkPictureData::getActiveOps(const SkRect& query) const {
|
| - if (NULL == fStateTree || NULL == fBoundingHierarchy) {
|
| - return NULL;
|
| - }
|
| -
|
| - SkPicture::OperationList* activeOps = SkNEW(SkPicture::OperationList);
|
| - fBoundingHierarchy->search(query, &(activeOps->fOps));
|
| - return activeOps;
|
| -}
|
| -
|
| #if SK_SUPPORT_GPU
|
| bool SkPictureData::suitableForGpuRasterization(GrContext* context, const char **reason,
|
| int sampleCount) const {
|
|
|