Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1470)

Unified Diff: android_webview/java/src/org/chromium/android_webview/AwContents.java

Issue 881383002: Return void in zoomBy plumbing to match zoomBy public API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: always return true from WebViewChromium.zoomBy Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/java/src/org/chromium/android_webview/AwContents.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 70393519e174d7507f13a9d30555188818b5e2fb..8b0cf2c735921aa2d377a545b31c10350568cc41 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -1710,7 +1710,8 @@ public class AwContents implements SmartClipProvider {
if (!canZoomIn()) {
return false;
}
- return zoomBy(1.25f);
+ zoomBy(1.25f);
+ return true;
}
/**
@@ -1722,7 +1723,8 @@ public class AwContents implements SmartClipProvider {
if (!canZoomOut()) {
return false;
}
- return zoomBy(0.8f);
+ zoomBy(0.8f);
+ return true;
}
/**
@@ -1730,12 +1732,12 @@ public class AwContents implements SmartClipProvider {
*/
// This method uses the term 'zoom' for legacy reasons, but relates
// to what chrome calls the 'page scale factor'.
- public boolean zoomBy(float delta) {
- if (isDestroyed()) return false;
+ public void zoomBy(float delta) {
+ if (isDestroyed()) return;
if (delta < 0.01f || delta > 100.0f) {
throw new IllegalStateException("zoom delta value outside [0.01, 100] range.");
}
- return mContentViewCore.pinchByDelta(delta);
+ mContentViewCore.pinchByDelta(delta);
}
/**

Powered by Google App Engine
This is Rietveld 408576698