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

Commit 00ef15b9 authored by Mangesh Ghiware's avatar Mangesh Ghiware Committed by Android (Google) Code Review
Browse files

Merge "Clamp initial scale between minimum and maximum values." into ics-mr1

parents ca4100da ca4d54c4

core/java/android/webkit/WebViewCore.java

+12 −0
Original line number Diff line number Diff line
@@ -2290,6 +2290,18 @@ public final class WebViewCore { 
        // set the viewport settings from WebKit

        setViewportSettingsFromNative();



        // clamp initial scale

        if (mViewportInitialScale > 0) {

            if (mViewportMinimumScale > 0) {

                mViewportInitialScale = Math.max(mViewportInitialScale,

                        mViewportMinimumScale);

            }

            if (mViewportMaximumScale > 0) {

                mViewportInitialScale = Math.min(mViewportInitialScale,

                        mViewportMaximumScale);

            }

        }



        if (mSettings.forceUserScalable()) {

            mViewportUserScalable = true;

            if (mViewportInitialScale > 0) {