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

Commit f53c1865 authored by Grace Kloba's avatar Grace Kloba
Browse files

Don't snap the initialScale to min or max if it is not defined. 

Fix http://b/issue?id=2133821
parent 5b4aa6db

core/java/android/webkit/WebViewCore.java

+6 −12
Original line number Original line Diff line number Diff line
@@ -1867,19 +1867,13 @@ final class WebViewCore { 
            mViewportMinimumScale = WebView.DEFAULT_SCALE_PERCENT;

            mViewportMinimumScale = WebView.DEFAULT_SCALE_PERCENT;

            mViewportMaximumScale = WebView.DEFAULT_SCALE_PERCENT;

            mViewportMaximumScale = WebView.DEFAULT_SCALE_PERCENT;

        }

        }

        if (mViewportMinimumScale > mViewportInitialScale) {

        if (mViewportMinimumScale > mViewportInitialScale

            if (mViewportInitialScale == 0) {

                && mViewportInitialScale != 0) {

                mViewportInitialScale = mViewportMinimumScale;

            } else {

            mViewportMinimumScale = mViewportInitialScale;

            mViewportMinimumScale = mViewportInitialScale;

        }

        }

        }

        if (mViewportMaximumScale > 0

        if (mViewportMaximumScale > 0) {

                && mViewportMaximumScale < mViewportInitialScale) {

            if (mViewportMaximumScale < mViewportInitialScale) {

            mViewportMaximumScale = mViewportInitialScale;

            mViewportMaximumScale = mViewportInitialScale;

            } else if (mViewportInitialScale == 0) {

                mViewportInitialScale = mViewportMaximumScale;

            }

        }

        }

        if (mViewportWidth < 0

        if (mViewportWidth < 0

                && mViewportInitialScale == WebView.DEFAULT_SCALE_PERCENT) {

                && mViewportInitialScale == WebView.DEFAULT_SCALE_PERCENT) {