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

Author: mghiware

core/java/android/webkit/ZoomManager.java

@@ -651,6 +651,11 @@ && exceedsMinScaleIncrement(mTextWrapScale, newTextWrapScale)
             mTextWrapScale = newTextWrapScale;
             refreshZoomScale(true);
         } else if (!mInZoomOverview && willScaleTriggerZoom(getZoomOverviewScale())) {
+            // Reflow, if necessary.
+            if (mTextWrapScale > getReadingLevelScale()) {
+                mTextWrapScale = getReadingLevelScale();
+                refreshZoomScale(true);
+            }
             zoomToOverview();
         } else {
             zoomToReadingLevelOrMore();