diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-17 15:10:02 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-03-17 15:10:02 +0000 |
| commit | 1c556dba153f880cad1f3e2996a320d61435f3c2 (patch) | |
| tree | e6c068261660cbeb9d0f9f6cd9ce149d66b90625 /src/core/SkPicturePlayback.h | |
| parent | 0b23f9e15f87363249cb66db2dd9918bc42d72ab (diff) | |
Reverting r13831 (Add a means of extracting active operations from SkPicture) due to Mac compiler issue
git-svn-id: http://skia.googlecode.com/svn/trunk@13832 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkPicturePlayback.h')
| -rw-r--r-- | src/core/SkPicturePlayback.h | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h index 11624205d4..512f24a77e 100644 --- a/src/core/SkPicturePlayback.h +++ b/src/core/SkPicturePlayback.h @@ -85,8 +85,6 @@ public: virtual ~SkPicturePlayback(); - const SkPicture::OperationList& getActiveOps(const SkIRect& queryRect); - void draw(SkCanvas& canvas, SkDrawPictureCallback*); void serialize(SkWStream*, SkPicture::EncodeBitmap) const; @@ -111,7 +109,7 @@ protected: virtual void postDraw(int opIndex); #endif - void preLoadBitmaps(const SkTDArray<void*>* results); + void preLoadBitmaps(const SkTDArray<void*>& results); private: class TextContainer { @@ -239,29 +237,6 @@ private: SkBBoxHierarchy* fBoundingHierarchy; SkPictureStateTree* fStateTree; - class CachedOperationList : public SkPicture::OperationList { - public: - CachedOperationList() { - fCacheQueryRect.setEmpty(); - } - - virtual bool valid() const { return true; } - virtual int numOps() const SK_OVERRIDE { return fOps.count(); } - virtual uint32_t offset(int index) const SK_OVERRIDE; - virtual const SkMatrix& matrix(int index) const SK_OVERRIDE; - - // The query rect for which the cached active ops are valid - SkIRect fCacheQueryRect; - - // The operations which are active within 'fCachedQueryRect' - SkTDArray<void*> fOps; - - private: - typedef SkPicture::OperationList INHERITED; - }; - - CachedOperationList* fCachedActiveOps; - SkTypefacePlayback fTFPlayback; SkFactoryPlayback* fFactoryPlayback; #ifdef SK_BUILD_FOR_ANDROID |