diff options
author | robertphillips <robertphillips@google.com> | 2014-07-07 13:46:35 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-07-07 13:46:35 -0700 |
commit | ce4dd3de38cd7c29bf5b9d8a8efb55c08ec9be47 (patch) | |
tree | 93e49c2020bb0a75e8acc3d09b8266962a171c14 /src/utils | |
parent | 5e8a3c1b83b8e6f41452298a1da5343b471759fd (diff) |
Split SkPicturePlayback out of SkPictureData
This splits the playback functionality out of SkPictureData. The old SkPictureData::draw method is pulled out along
with its supporting functions as verbatim as possible. Some follow on CLs will be required to:
re-enable profiling in the debugger (and remove the vestiges of SkTimedPicture)
re-enable display of command offsets in the picture (this should probably wait until we've switched to SkRecord though)
Clean up CachedOperationList (maybe fuse with SkPicture::OperationList)
Split SkPicturePlayback into a base class and two derived classes
Implement parallel version of GatherGPUInfo for SkRecord
Landing this is blocked on removing Android's use of the abortPlayback entry point.
R=mtklein@google.com, reed@google.com
Author: robertphillips@google.com
Review URL: https://codereview.chromium.org/377623002
Diffstat (limited to 'src/utils')
-rw-r--r-- | src/utils/SkPictureUtils.cpp | 2 | ||||
-rw-r--r-- | src/utils/debugger/SkDebugCanvas.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/utils/SkPictureUtils.cpp b/src/utils/SkPictureUtils.cpp index 702a78dda2..85d523f46c 100644 --- a/src/utils/SkPictureUtils.cpp +++ b/src/utils/SkPictureUtils.cpp @@ -190,7 +190,7 @@ private: typedef SkBaseDevice INHERITED; }; -SkData* SkPictureUtils::GatherPixelRefs(SkPicture* pict, const SkRect& area) { +SkData* SkPictureUtils::GatherPixelRefs(const SkPicture* pict, const SkRect& area) { if (NULL == pict) { return NULL; } diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index a3902d2a4e..50a9152239 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -314,9 +314,11 @@ private: void applyUserTransform(SkCanvas* canvas); size_t getOpID() const { +#if 0 if (NULL != fPicture) { return fPicture->EXPERIMENTAL_curOpID(); } +#endif return 0; } |