| Index: src/core/SkPicturePlayback.h
|
| diff --git a/src/core/SkPicturePlayback.h b/src/core/SkPicturePlayback.h
|
| index cdfa8efe188292dbf06783eecec125c446add641..9e5db08c6309ad74e6dd1039bd5cb9d9491d4c23 100644
|
| --- a/src/core/SkPicturePlayback.h
|
| +++ b/src/core/SkPicturePlayback.h
|
| @@ -9,7 +9,6 @@
|
| #define SkPicturePlayback_DEFINED
|
|
|
| #include "SkPictureFlat.h" // for DrawType
|
| -#include "SkPictureStateTree.h"
|
|
|
| class SkBitmap;
|
| class SkCanvas;
|
| @@ -18,14 +17,11 @@ class SkPaint;
|
| class SkPictureData;
|
|
|
| // The basic picture playback class replays the provided picture into a canvas.
|
| -// If the picture was generated with a BBH it is used to accelerate drawing
|
| -// unless disabled via setUseBBH.
|
| class SkPicturePlayback : SkNoncopyable {
|
| public:
|
| SkPicturePlayback(const SkPicture* picture)
|
| : fPictureData(picture->fData.get())
|
| - , fCurOffset(0)
|
| - , fUseBBH(true) {
|
| + , fCurOffset(0) {
|
| }
|
| virtual ~SkPicturePlayback() { }
|
|
|
| @@ -37,31 +33,18 @@ public:
|
| size_t curOpID() const { return fCurOffset; }
|
| void resetOpID() { fCurOffset = 0; }
|
|
|
| - // TODO: remove setUseBBH after cleaning up GrGatherCanvas
|
| - void setUseBBH(bool useBBH) { fUseBBH = useBBH; }
|
| -
|
| protected:
|
| const SkPictureData* fPictureData;
|
|
|
| // The offset of the current operation when within the draw method
|
| size_t fCurOffset;
|
|
|
| - bool fUseBBH;
|
| -
|
| - void handleOp(SkReader32* reader,
|
| - DrawType op,
|
| - uint32_t size,
|
| + void handleOp(SkReader32* reader,
|
| + DrawType op,
|
| + uint32_t size,
|
| SkCanvas* canvas,
|
| const SkMatrix& initialMatrix);
|
|
|
| - const SkPicture::OperationList* getActiveOps(const SkCanvas* canvas);
|
| - bool initIterator(SkPictureStateTree::Iterator* iter,
|
| - SkCanvas* canvas,
|
| - const SkPicture::OperationList *activeOpsList);
|
| - static void StepIterator(SkPictureStateTree::Iterator* iter, SkReader32* reader);
|
| - static void SkipIterTo(SkPictureStateTree::Iterator* iter,
|
| - SkReader32* reader, uint32_t skipTo);
|
| -
|
| static DrawType ReadOpAndSize(SkReader32* reader, uint32_t* size);
|
|
|
| class AutoResetOpID {
|
|
|