Fix SkAndroidSDKCanvas virtuals

src/utils/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 255 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);
 }
 
-const void* SkAndroidSDKCanvas::onPeekPixels(SkImageInfo* info, size_t* data) {
-    return fProxyTarget->peekPixels(info, data);
+bool SkAndroidSDKCanvas::onPeekPixels(SkPixmap* data) {

[scroggo, 2015/05/26 20:29:28]

nit: data seems a little vague. Why not "pmap"?

+    SkImageInfo info;
+    size_t rowBytes;
+    const void* addr = fProxyTarget->peekPixels(&info, &rowBytes);
+    if (data) {

[scroggo, 2015/05/26 20:29:28]

I think the pixmap will always be non-null?

[reed1, 2015/05/26 20:53:22]

should be 

if (addr) {

+        data->reset(info, addr, rowBytes);
+        if (addr) {

[reed1, 2015/05/26 20:53:21]

this check of addr is unneeded

+            return true;
+        }
+    }
+    return false;
 }
 
-void* SkAndroidSDKCanvas::onAccessTopLayerPixels(SkImageInfo* info, size_t* data) {
-    return fProxyTarget->accessTopLayerPixels(info, data);
+bool SkAndroidSDKCanvas::onAccessTopLayerPixels(SkPixmap* data) {

[scroggo, 2015/05/26 20:29:28]

Same comments for this method.

+    SkImageInfo info;
+    size_t rowBytes; 
+    const void* addr = fProxyTarget->accessTopLayerPixels(&info, &rowBytes, NULL);
+    if (data) {
+        data->reset(info, addr, rowBytes);
+        if (addr) {
+            return true;
+        }
+    }
+    return false;
 }
 
 void SkAndroidSDKCanvas::willSave() {
     fProxyTarget->save();
 }
 
 SkCanvas::SaveLayerStrategy SkAndroidSDKCanvas::willSaveLayer(const SkRect* rect,
                                                               const SkPaint* paint,
                                                               SaveFlags flags) {
     fProxyTarget->saveLayer(rect, paint, flags);
@@ skipping 32 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(); }