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

Commit 85a8dcec authored by Grace Kloba's avatar Grace Kloba Committed by Android (Google) Code Review
Browse files

Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced... 

Merge "Only honor the scrollbar mode at the minimum zoom level. This reduced the impact of https://android-git.corp.google.com/g/#change,48683. In GB, we need to revisit this issue." into froyo
parents 8b0047f8 0653d22f

core/java/android/webkit/WebView.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -2286,7 +2286,9 @@ public class WebView extends AbsoluteLayout 
    protected int computeHorizontalScrollRange() {

    protected int computeHorizontalScrollRange() {

        if (mDrawHistory) {

        if (mDrawHistory) {

            return mHistoryWidth;

            return mHistoryWidth;

        } else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF) {

        } else if (mHorizontalScrollBarMode == SCROLLBAR_ALWAYSOFF

                && (mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT)) {

            // only honor the scrollbar mode when it is at minimum zoom level

            return computeHorizontalScrollExtent();

            return computeHorizontalScrollExtent();

        } else {

        } else {

            // to avoid rounding error caused unnecessary scrollbar, use floor

            // to avoid rounding error caused unnecessary scrollbar, use floor
@@ -2298,7 +2300,9 @@ public class WebView extends AbsoluteLayout 
    protected int computeVerticalScrollRange() {

    protected int computeVerticalScrollRange() {

        if (mDrawHistory) {

        if (mDrawHistory) {

            return mHistoryHeight;

            return mHistoryHeight;

        } else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF) {

        } else if (mVerticalScrollBarMode == SCROLLBAR_ALWAYSOFF

                && (mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT)) {

            // only honor the scrollbar mode when it is at minimum zoom level

            return computeVerticalScrollExtent();

            return computeVerticalScrollExtent();

        } else {

        } else {

            // to avoid rounding error caused unnecessary scrollbar, use floor

            // to avoid rounding error caused unnecessary scrollbar, use floor