aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrPictureUtils.cpp
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@google.com>2014-06-23 15:13:26 -0400
committerGravatar Mike Klein <mtklein@google.com>2014-06-23 15:13:26 -0400
commit744fb7313f31069e9eceeca4c0ff33dbe2fe1737 (patch)
tree03301f1ecae486d27fc9c6a6de58a042d47f8c3f /src/gpu/GrPictureUtils.cpp
parent5fb6bd4b7e8d00b7f2543ca10ec9022b32632f29 (diff)
Enable basic drawing with SkRecord-based pictures.
I've tagged all the functions in SkPicture.cpp is // fRecord TODO or // fRecord OK, depending on whether or not they're totally broken when used from an SkRecord-based picture. Obviously next steps are to eliminate all the TODOs, then clean up the notes. I converted SkPicture over to smart pointers too. It's particularly helpful that the smart pointers initialize to NULL by default. For now I've got all the SkRecord-based code jammed in at the bottom of the file. I figure it'll help me keep things straight for a bit, then we can rearrange later. BUG=skia: R=robertphillips@google.com Review URL: https://codereview.chromium.org/333823007
Diffstat (limited to 'src/gpu/GrPictureUtils.cpp')
-rw-r--r--src/gpu/GrPictureUtils.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/GrPictureUtils.cpp b/src/gpu/GrPictureUtils.cpp
index 6fed2f6d9f..c677c64bd1 100644
--- a/src/gpu/GrPictureUtils.cpp
+++ b/src/gpu/GrPictureUtils.cpp
@@ -250,11 +250,11 @@ protected:
virtual void onDrawPicture(const SkPicture* picture) SK_OVERRIDE {
// BBH-based rendering doesn't re-issue many of the operations the gather
// process cares about (e.g., saves and restores) so it must be disabled.
- if (NULL != picture->fPlayback) {
+ if (NULL != picture->fPlayback.get()) {
picture->fPlayback->setUseBBH(false);
}
picture->draw(this);
- if (NULL != picture->fPlayback) {
+ if (NULL != picture->fPlayback.get()) {
picture->fPlayback->setUseBBH(true);
}
}