From a31eacb22e12a4223740e53ff5a11bd08340106e Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 28 Apr 2014 20:17:48 +0000 Subject: Refactor SkPictureStateTree::Iterator to avoid use of kClip_SaveFlag. The current implementation relies on soon-to-be-deprecated kClip_SaveFlag behavior. Updated to use default save flags (kMatrixClip_SaveFlag) and stop assuming that the matrix survives restore() calls. R=junov@chromium.org, reed@google.com, robertphillips@chromium.org, robertphillips@google.com Committed: http://code.google.com/p/skia/source/detail?r=14319 Author: fmalita@chromium.org Review URL: https://codereview.chromium.org/246893005 git-svn-id: http://skia.googlecode.com/svn/trunk@14421 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/core/SkPicturePlayback.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core/SkPicturePlayback.cpp') diff --git a/src/core/SkPicturePlayback.cpp b/src/core/SkPicturePlayback.cpp index bd5244d223..7d4c843083 100644 --- a/src/core/SkPicturePlayback.cpp +++ b/src/core/SkPicturePlayback.cpp @@ -851,7 +851,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) fStateTree->getIterator(*activeOps, &canvas); if (it.isValid()) { - uint32_t skipTo = it.draw(); + uint32_t skipTo = it.nextDraw(); if (kDrawComplete == skipTo) { return; } @@ -907,7 +907,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) // iterator until at or after skipTo uint32_t adjustedSkipTo; do { - adjustedSkipTo = it.draw(); + adjustedSkipTo = it.nextDraw(); } while (adjustedSkipTo < skipTo); skipTo = adjustedSkipTo; } @@ -1246,7 +1246,7 @@ void SkPicturePlayback::draw(SkCanvas& canvas, SkDrawPictureCallback* callback) #endif if (it.isValid()) { - uint32_t skipTo = it.draw(); + uint32_t skipTo = it.nextDraw(); if (kDrawComplete == skipTo) { break; } -- cgit v1.2.3