Update SkAndroidSDKCanvas.

Hope that's right... nothing but the Android roll builds this code.

Change-Id: Ib86099deaaa5a67a480d6dc0eece8552e58aae1c
Reviewed-on: https://skia-review.googlesource.com/7428
Reviewed-by: Mike Klein <mtklein@chromium.org>
Commit-Queue: Mike Klein <mtklein@chromium.org>

diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp
index 27a0235..6f5aaf1 100644 (file)
--- a/tools/android/SkAndroidSDKCanvas.cpp
+++ b/tools/android/SkAndroidSDKCanvas.cpp
@@ -287,11 +287,11 @@ void SkAndroidSDKCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* ma
 SkISize SkAndroidSDKCanvas::getBaseLayerSize() const {
     return fProxyTarget->getBaseLayerSize();
 }
-bool SkAndroidSDKCanvas::getClipBounds(SkRect* rect) const {
-    return fProxyTarget->getClipBounds(rect);
+SkRect SkAndroidSDKCanvas::onGetLocalClipBounds() const {
+    return fProxyTarget->getLocalClipBounds();
 }
-bool SkAndroidSDKCanvas::getClipDeviceBounds(SkIRect* rect) const {
-    return fProxyTarget->getClipDeviceBounds(rect);
+SkIRect SkAndroidSDKCanvas::onGetDeviceClipBounds() const {
+    return fProxyTarget->getDeviceClipBounds();
 }
 
 bool SkAndroidSDKCanvas::isClipEmpty() const { return fProxyTarget->isClipEmpty(); }

diff --git a/tools/android/SkAndroidSDKCanvas.h b/tools/android/SkAndroidSDKCanvas.h
index 97d9cdb..6b8eb67 100644 (file)
--- a/tools/android/SkAndroidSDKCanvas.h
+++ b/tools/android/SkAndroidSDKCanvas.h
@@ -87,8 +87,8 @@ protected:
 
     void onDrawDrawable(SkDrawable*, const SkMatrix*) override;
     SkISize getBaseLayerSize() const override;
-    bool getClipBounds(SkRect*) const override;
-    bool getClipDeviceBounds(SkIRect*) const override;
+    SkRect onGetLocalClipBounds() const override;
+    SkIRect onGetDeviceClipBounds() const override;
     bool isClipEmpty() const override;
     bool isClipRect() const override;
     sk_sp<SkSurface> onNewSurface(const SkImageInfo&, const SkSurfaceProps&) override;