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

Commit 1c02c6a7 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang
Browse files

Squashed commit of the following: 

commit 35ade1c72b5fe34c177712108ccbc070eab11a87
Author: Shimeng (Simon) Wang <swang@google.com>
Date:   Thu Mar 4 16:29:01 2010 -0800

    Alternative way to fix the history picture drawing issue.

    Disable zoom part for history picture mode.

    Bug: 2462039

commit 1a27acaa36c60546e5e6b2e1caf4ce5488dad14b
Author: Shimeng (Simon) Wang <swang@google.com>
Date:   Thu Mar 4 16:06:41 2010 -0800

    Use the screen width to derive the desired scale.

    This is to fix the history picture draw issue.  Since the mActualScale
    will be changed in some other places.

    Bug: 2462039
parent e354bba5

core/java/android/webkit/WebView.java

+28 −25
Original line number Diff line number Diff line
@@ -5927,9 +5927,11 @@ public class WebView extends AbsoluteLayout 
                    WebViewCore.RestoreState restoreState = draw.mRestoreState;

                    boolean hasRestoreState = restoreState != null;

                    if (hasRestoreState) {

                        mInZoomOverview = false;

                        updateZoomRange(restoreState, viewSize.x,

                                draw.mMinPrefWidth, true);

                        if (!mDrawHistory) {

                            mInZoomOverview = false;



                            if (mInitialScaleInPercent > 0) {

                                setNewZoomScale(mInitialScaleInPercent / 100.0f,

                                    mInitialScaleInPercent != mTextWrapScale * 100,
@@ -5963,6 +5965,7 @@ public class WebView extends AbsoluteLayout 
                                updateZoomButtonsEnabled();

                            }

                        }

                    }

                    // We update the layout (i.e. request a layout from the

                    // view system) if the last view size that we sent to

                    // WebCore matches the view size of the picture we just