Merge "Make sure the reading level scale is within min/max limits." into honeycomb

2011-01-06 15:39:49 -08:00
parent de69817b3c e85ffea862
commit adba8021cd
1 changed files with 3 additions and 2 deletions
--- 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() {