From 886b372b52d122d25f95ef39833254197bebba69 Mon Sep 17 00:00:00 2001
From: Mangesh Ghiware <mghiware@google.com>
Date: Fri, 9 Sep 2011 16:04:22 -0700
Subject: [PATCH] On zoom to overview, reflow text, if necessary.

Reset the text wrap scale to the correct value (i.e., reading level
scale) on zoom to overview. This addresses the scenario where text is
wrapped at a larger scale following a pinch zoom and double tap to
reflow.

Bug: 5254253
Change-Id: I57f706ef4254dd3f194cc35f109dd48b61b72f73
---
 core/java/android/webkit/ZoomManager.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/java/android/webkit/ZoomManager.java b/core/java/android/webkit/ZoomManager.java
index 0bfb6683452bb..7ca6aeba87fee 100644
--- 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();