From 5a0bf1f03e5f62449ea2520edb79ea868e6f06e7 Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Fri, 15 Jan 2010 16:02:57 -0800 Subject: [PATCH] DO NOT MERGE Remove testing (enable plugin) code. No reflow when zoom in, auto reflow when zoom out. Fix http://b/issue?id=2375955 --- core/java/android/webkit/WebView.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index e85eea47220ab..c749df34c2bde 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -3747,8 +3747,10 @@ public class WebView extends AbsoluteLayout mPreviewZoomOnly = false; mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX); mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY); - // for testing only, default don't reflow now - boolean reflowNow = !getSettings().getPluginsEnabled(); + // don't reflow when zoom in; when zoom out, do reflow if the + // new scale is almost minimum scale; + boolean reflowNow = (mActualScale - mMinZoomScale <= 0.01f) + || ((mActualScale <= 0.8 * mTextWrapScale)); // force zoom after mPreviewZoomOnly is set to false so that the // new view size will be passed to the WebKit setNewZoomScale(mActualScale, reflowNow, true);