Merge "On zoom to overview, reflow text, if necessary."

2011-09-12 09:46:49 -07:00
parent 049f5cc3de 886b372b52
commit fa0d2316f9
1 changed files with 5 additions and 0 deletions
--- a/core/java/android/webkit/ZoomManager.java
+++ b/core/java/android/webkit/ZoomManager.java
@@ -651,6 +651,11 @@ class ZoomManager {
            mTextWrapScale = newTextWrapScale;
            refreshZoomScale(true);
        } else if (!mInZoomOverview && willScaleTriggerZoom(getZoomOverviewScale())) {
+            // Reflow, if necessary.
+            if (mTextWrapScale > getReadingLevelScale()) {
+                mTextWrapScale = getReadingLevelScale();
+                refreshZoomScale(true);
+            }
            zoomToOverview();
        } else {
            zoomToReadingLevelOrMore();