unify peekPixels around pixmap parameter

tools/android/SkAndroidSDKCanvas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAndroidSDKCanvas.h"
 
 #include "SkColorFilter.h"
@@ skipping 274 matching lines @@
 
 bool SkAndroidSDKCanvas::isClipEmpty() const { return fProxyTarget->isClipEmpty(); }
 bool SkAndroidSDKCanvas::isClipRect() const { return fProxyTarget->isClipRect(); }
 
 SkSurface* SkAndroidSDKCanvas::onNewSurface(const SkImageInfo& info,
                                                      const SkSurfaceProps& props) {
     return fProxyTarget->newSurface(info, &props);
 }
 
 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) {
     SkASSERT(pmap);
     SkImageInfo info;
     size_t rowBytes; 
     const void* addr = fProxyTarget->accessTopLayerPixels(&info, &rowBytes, nullptr);
     if (addr) {
         pmap->reset(info, addr, rowBytes);
         return true;
@@ skipping 42 matching lines @@
     fProxyTarget->clipPath(path, op, style);
 }
 
 void SkAndroidSDKCanvas::onClipRegion(const SkRegion& region, SkRegion::Op op) {
     fProxyTarget->clipRegion(region, op);
 }
 
 void SkAndroidSDKCanvas::onDiscard() { fProxyTarget->discard(); }