aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/android
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-01-23 21:41:46 -0500
committerGravatar Mike Klein <mtklein@chromium.org>2017-01-24 02:43:38 +0000
commitad24145e41b473012a900818933291541e80815c (patch)
tree2804acef3c13c9bb0bc670daa921e8461f454bf2 /tools/android
parent5d5cc3cb2279741343a1d09a956703189fb228c3 (diff)
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>
Diffstat (limited to 'tools/android')
-rw-r--r--tools/android/SkAndroidSDKCanvas.cpp8
-rw-r--r--tools/android/SkAndroidSDKCanvas.h4
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/android/SkAndroidSDKCanvas.cpp b/tools/android/SkAndroidSDKCanvas.cpp
index 27a0235eda..6f5aaf1cc9 100644
--- 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 97d9cdb78d..6b8eb67668 100644
--- 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;