From 6ceeebd37a43d879c120b6ba100ae1febdd67a18 Mon Sep 17 00:00:00 2001 From: reed Date: Wed, 9 Mar 2016 14:26:26 -0800 Subject: 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 --- tools/android/SkAndroidSDKCanvas.cpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'tools/android') 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) { -- cgit v1.2.3