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

Commit 10d63fad authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang Committed by Android (Google) Code Review
Browse files

Merge "Make sure zoom width is changed before fit-to-screen."

parents bdbdf014 a05fa968

core/java/android/webkit/ZoomManager.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -890,7 +890,7 @@ class ZoomManager { 
                !exceedsMinScaleIncrement(newZoomOverviewScale, 1.0f);

                !exceedsMinScaleIncrement(newZoomOverviewScale, 1.0f);

        if (!mWebView.drawHistory() &&

        if (!mWebView.drawHistory() &&

                (mInitialZoomOverview || scaleLessThanOverview || mobileSiteInOverview) &&

                (mInitialZoomOverview || scaleLessThanOverview || mobileSiteInOverview) &&

                scaleHasDiff) {

                scaleHasDiff && zoomOverviewWidthChanged) {

            mInitialZoomOverview = false;

            mInitialZoomOverview = false;

            setZoomScale(newZoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale) &&

            setZoomScale(newZoomOverviewScale, !willScaleTriggerZoom(mTextWrapScale) &&

                !mWebView.getSettings().getUseFixedViewport());

                !mWebView.getSettings().getUseFixedViewport());