diff options
author | kkinnunen <kkinnunen@nvidia.com> | 2015-03-23 02:18:02 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-23 02:18:02 -0700 |
commit | 8dcb8b04f80eff810e63c2696c01f6150d104109 (patch) | |
tree | 2214c3f0a15ab86b4a807eb166b03eb9cc788bd8 /src | |
parent | 96017dc2b8af043084a2e5210c42d682dcf983a3 (diff) |
Do not playback pending commands for full deferred canvas writePixels
Do not playback pending commands for full deferred canvas writePixels.
Changes the test to catch cases where discard is done without
a snapshot.
Review URL: https://codereview.chromium.org/939103002
Diffstat (limited to 'src')
-rw-r--r-- | src/utils/SkDeferredCanvas.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp index 647105d757..5b3b58cdf0 100644 --- a/src/utils/SkDeferredCanvas.cpp +++ b/src/utils/SkDeferredCanvas.cpp @@ -442,11 +442,11 @@ bool SkDeferredDevice::onWritePixels(const SkImageInfo& info, const void* pixels SkASSERT(x + info.width() <= width()); SkASSERT(y + info.height() <= height()); - this->flushPendingCommands(kNormal_PlaybackMode); - const SkImageInfo deviceInfo = this->imageInfo(); if (info.width() == deviceInfo.width() && info.height() == deviceInfo.height()) { this->skipPendingCommands(); + } else { + this->flushPendingCommands(kNormal_PlaybackMode); } this->prepareForImmediatePixelWrite(); |