diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-13 17:14:46 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-13 17:14:46 +0000 |
| commit | c3bd8af6d5722e854feca70c40d92f4954c5b67b (patch) | |
| tree | d66f5fa5e139469c523882685cd1dfb4c8f83529 /gm/xfermodes3.cpp | |
| parent | e1df56579f815fe1f788380e9342abe5284bab51 (diff) | |
add peekPixels to SkCanvas and SkSurface
fix reference to SkBaseDevice, which was only a problem in no-gpu build
This reverts commit 4fa44a6bf73891b21917fb90d02beef9143bffa3.
R=reed@google.com
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/163603003
git-svn-id: http://skia.googlecode.com/svn/trunk@13432 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'gm/xfermodes3.cpp')
| -rw-r--r-- | gm/xfermodes3.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gm/xfermodes3.cpp b/gm/xfermodes3.cpp index bb7d6149c5..76c4b88380 100644 --- a/gm/xfermodes3.cpp +++ b/gm/xfermodes3.cpp @@ -168,8 +168,11 @@ private: if (NULL == layerCanvas) { canvas->restore(); } else { - SkBitmap bitmap = layerCanvas->getDevice()->accessBitmap(false); - canvas->drawBitmap(bitmap, 0, 0); + SkAutoROCanvasPixels ropixels(layerCanvas); + SkBitmap bitmap; + if (ropixels.asROBitmap(&bitmap)) { + canvas->drawBitmap(bitmap, 0, 0); + } } r.inset(-SK_ScalarHalf, -SK_ScalarHalf); |