diff options
| author |  reed <reed@google.com> | 2016-03-09 14:26:26 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-09 14:26:26 -0800 |
| commit | 6ceeebd37a43d879c120b6ba100ae1febdd67a18 (patch) | |
| tree | 6c4dfeb68ba4183bc2e63d8888ae01f24caede88 /tools/android | |
| parent | f842c50116863f44240f806509f14e434eabb0a8 (diff) | |
unify peekPixels around pixmap parameter
requires this chrome CL to land first
https://codereview.chromium.org/1775393003/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1784563002
Review URL: https://codereview.chromium.org/1784563002
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/SkAndroidSDKCanvas.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp index 45fcc758f2..1deb97cbc6 100644 --- a/tools/android/SkAndroidSDKCanvas.cpp +++ b/tools/android/SkAndroidSDKCanvas.cpp @@ -292,15 +292,7 @@ SkSurface* SkAndroidSDKCanvas::onNewSurface(const SkImageInfo& info, } bool SkAndroidSDKCanvas::onPeekPixels(SkPixmap* pmap) { - SkASSERT(pmap); - SkImageInfo info; - size_t rowBytes; - const void* addr = fProxyTarget->peekPixels(&info, &rowBytes); - if (addr) { - pmap->reset(info, addr, rowBytes); - return true; - } - return false; + return fProxyTarget->peekPixels(pmap); } bool SkAndroidSDKCanvas::onAccessTopLayerPixels(SkPixmap* pmap) { |