Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(139)

Unified Diff: src/core/SkPicturePlayback.h

Issue 203333005: Revert of r13836 due to Chromium cc_unittests failures (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkPicture.cpp ('k') | src/core/SkPicturePlayback.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPicturePlayback.h
===================================================================
--- src/core/SkPicturePlayback.h (revision 13849)
+++ src/core/SkPicturePlayback.h (working copy)
@@ -85,8 +85,6 @@
virtual ~SkPicturePlayback();
- const SkPicture::OperationList& getActiveOps(const SkIRect& queryRect);
-
void draw(SkCanvas& canvas, SkDrawPictureCallback*);
void serialize(SkWStream*, SkPicture::EncodeBitmap) const;
@@ -111,7 +109,7 @@
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 @@
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
« no previous file with comments | « src/core/SkPicture.cpp ('k') | src/core/SkPicturePlayback.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698