Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 5a0bf1f0: DO NOT MERGE

Browse Source 
Merge commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7' into eclair-plus-aosp

* commit '5a0bf1f03e5f62449ea2520edb79ea868e6f06e7':
  DO NOT MERGE
This commit is contained in:
Grace Kloba
2010-01-18 23:43:27 -08:00
committed by Android Git Automerger
parent 8d4baa7893 5a0bf1f03e
commit 55d791e74e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/WebView.java
View File

@@ -3747,8 +3747,10 @@ public class WebView extends AbsoluteLayout
mPreviewZoomOnly = false; mPreviewZoomOnly = false;
mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX); mAnchorX = viewToContentX((int) mZoomCenterX + mScrollX);
mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY); mAnchorY = viewToContentY((int) mZoomCenterY + mScrollY);
// for testing only, default don't reflow now // don't reflow when zoom in; when zoom out, do reflow if the
boolean reflowNow = !getSettings().getPluginsEnabled(); // 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 // force zoom after mPreviewZoomOnly is set to false so that the
// new view size will be passed to the WebKit // new view size will be passed to the WebKit
setNewZoomScale(mActualScale, reflowNow, true); setNewZoomScale(mActualScale, reflowNow, true);