Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55d791e7 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 5a0bf1f0: DO NOT MERGE 

Merge commit '5a0bf1f0' into eclair-plus-aosp

* commit '5a0bf1f0':
  DO NOT MERGE
parents 8d4baa78 5a0bf1f0

core/java/android/webkit/WebView.java

+4 −2
Original line number Diff line number Diff line
@@ -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);