summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shimeng (Simon) Wang <swang@google.com> 2011-01-06 15:01:58 -0800
committer Shimeng (Simon) Wang <swang@google.com> 2011-01-06 15:01:58 -0800
commite85ffea862a6b140269ac1b62372d4e9066fcf9c (patch)
tree0509f909560f67ede6be93d232319761e30df565
parent42edf0f8cf8ca85dd5010558ff399e2c9a4c779c (diff)
Make sure the reading level scale is within min/max limits.
This potentially helps the following issue. But anyway, this change is good to have. issue: 3292648 Change-Id: I0ad74b802d7ce2c3d66de8115187638f1d5e72ff
-rw-r--r--core/java/android/webkit/ZoomManager.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 075ecbc7ff9c..2fd5bb11b864 100644
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -260,8 +260,9 @@ class ZoomManager {
public final float getReadingLevelScale() {
// The reading scale is at least 0.5f apart from the overview scale.
final float MIN_SCALE_DIFF = 0.5f;
- return Math.max(getZoomOverviewScale() + MIN_SCALE_DIFF,
- DEFAULT_READING_LEVEL_SCALE);
+ return computeScaleWithLimits(
+ Math.max(getZoomOverviewScale() + MIN_SCALE_DIFF,
+ DEFAULT_READING_LEVEL_SCALE));
}
public final float getInvDefaultScale() {