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

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

Merge "Ignore viewport viewScale in fixed viewport mode."

parents c17942f7 9c64bae1

core/java/android/webkit/WebViewCore.java

+2 −1
Original line number Diff line number Diff line
@@ -2203,7 +2203,8 @@ final class WebViewCore { 
            if (mViewportInitialScale > 0) {

                mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =

                        mViewportInitialScale / 100.0f;

            } else if (mViewportWidth > 0 && mViewportWidth < webViewWidth) {

            } else if (mViewportWidth > 0 && mViewportWidth < webViewWidth &&

                !mWebView.getSettings().getUseFixedViewport()) {

                mInitialViewState.mViewScale = mInitialViewState.mTextWrapScale =

                        (float) webViewWidth / mViewportWidth;

            } else {