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

Commit 9c64bae1 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang
Browse files

Ignore viewport viewScale in fixed viewport mode. 

This is to solve macworld.com, which has 900 as viewport but actual
content width is more 1000.

issue: 3003933
Change-Id: I2db3f66828fd00c8be62131599395eb82752b4a2
parent 5c1cf359

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 {