| Index: src/core/SkPictureData.h
|
| diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h
|
| index b875151b5067c5ebd24dcc2e2ceb6009dd66f56b..02529938abcf1fa2727132038d7449ec2a171d27 100644
|
| --- a/src/core/SkPictureData.h
|
| +++ b/src/core/SkPictureData.h
|
| @@ -13,7 +13,6 @@
|
| #include "SkPicture.h"
|
| #include "SkPictureContentInfo.h"
|
| #include "SkPictureFlat.h"
|
| -#include "SkPictureStateTree.h"
|
|
|
| class SkData;
|
| class SkPictureRecord;
|
| @@ -24,7 +23,6 @@ class SkBBoxHierarchy;
|
| class SkMatrix;
|
| class SkPaint;
|
| class SkPath;
|
| -class SkPictureStateTree;
|
| class SkReadBuffer;
|
| class SkTextBlob;
|
|
|
| @@ -67,8 +65,6 @@ public:
|
|
|
| virtual ~SkPictureData();
|
|
|
| - const SkPicture::OperationList* getActiveOps(const SkRect& queryRect) const;
|
| -
|
| void serialize(SkWStream*, SkPicture::EncodeBitmap) const;
|
| void flatten(SkWriteBuffer&) const;
|
|
|
| @@ -123,14 +119,6 @@ public:
|
| return fTextBlobRefs[index - 1];
|
| }
|
|
|
| - void initIterator(SkPictureStateTree::Iterator* iter,
|
| - const SkTDArray<void*>& draws,
|
| - SkCanvas* canvas) const {
|
| - if (fStateTree) {
|
| - fStateTree->initIterator(iter, draws, canvas);
|
| - }
|
| - }
|
| -
|
| #if SK_SUPPORT_GPU
|
| /**
|
| * sampleCount is the number of samples-per-pixel or zero if non-MSAA.
|
| @@ -175,9 +163,6 @@ private:
|
| const SkTextBlob** fTextBlobRefs;
|
| int fTextBlobCount;
|
|
|
| - SkBBoxHierarchy* fBoundingHierarchy;
|
| - SkPictureStateTree* fStateTree;
|
| -
|
| SkPictureContentInfo fContentInfo;
|
|
|
| SkTypefacePlayback fTFPlayback;
|
|
|