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

Commit 03e48915 authored by Derek Sollenberger's avatar Derek Sollenberger
Browse files

Refactoring more webview zoom code into ZoomManager. 

This CL is #2 of multiple CL's to remove the zoom code
from webview and place it into webkit.ZoomManager. Each
commit is only part of the entire refactoring so there
are many ZoomManager.* variables still referenced from
WebView.

Change-Id: I21f6517dff46b65a277bc67120ffabe043098e5e
http://b/2671604
parent 5f3004c1

core/java/android/webkit/WebTextView.java

+0 −10
Original line number Diff line number Diff line
@@ -938,14 +938,4 @@ import java.util.ArrayList; 
    /* package */ void updateCachedTextfield() {

        mWebView.updateCachedTextfield(getText().toString());

    }



    @Override

    public boolean requestRectangleOnScreen(Rect rectangle) {

        // don't scroll while in zoom animation. When it is done, we will adjust

        // the WebTextView if it is in editing mode.

        if (!mWebView.inAnimateZoom()) {

            return super.requestRectangleOnScreen(rectangle);

        }

        return false;

    }

}

core/java/android/webkit/WebView.java

+166 −315

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/webkit/WebViewCore.java

+4 −2
Original line number Diff line number Diff line
@@ -2064,8 +2064,10 @@ final class WebViewCore { 
        // adjust the default scale to match the densityDpi

        float adjust = 1.0f;

        if (mViewportDensityDpi == -1) {

            if (WebView.DEFAULT_SCALE_PERCENT != 100) {

                adjust = WebView.DEFAULT_SCALE_PERCENT / 100.0f;

            // convert default zoom scale to a integer (percentage) to avoid any

            // issues with floating point comparisons

            if (mWebView != null && (int)(mWebView.getDefaultZoomScale() * 100) != 100) {

                adjust = mWebView.getDefaultZoomScale();

            }

        } else if (mViewportDensityDpi > 0) {

            adjust = (float) mContext.getResources().getDisplayMetrics().densityDpi

core/java/android/webkit/ZoomManager.java

+209 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.webkit;



import android.os.SystemClock;

import android.view.View;



class ZoomManager {
@@ -23,6 +24,7 @@ class ZoomManager { 
    static final String LOGTAG = "webviewZoom";



    private final WebView mWebView;

    private final CallbackProxy mCallbackProxy;



    // manages the on-screen zoom functions of the WebView

    private ZoomControlEmbedded mEmbeddedZoomControl;
@@ -51,15 +53,219 @@ class ZoomManager { 
    // the last zoom scale.

    boolean mInZoomOverview = false;



    public ZoomManager(WebView webView) {

    // These keep track of the center point of the zoom.  They are used to

    // determine the point around which we should zoom.

    float mZoomCenterX;

    float mZoomCenterY;



    // ideally mZoomOverviewWidth should be mContentWidth. But sites like espn,

    // engadget always have wider mContentWidth no matter what viewport size is.

    int mZoomOverviewWidth = WebView.DEFAULT_VIEWPORT_WIDTH;

    float mTextWrapScale;



    // the default zoom scale. This value will is initially set based on the

    // display density, but can be changed at any time via the WebSettings.

    float mDefaultScale;



    private static float MINIMUM_SCALE_INCREMENT = 0.01f;



    // set to true temporarily during ScaleGesture triggered zoom

    boolean mPreviewZoomOnly = false;



    // the current computed zoom scale and its inverse.

    float mActualScale;

    float mInvActualScale;

    // if this is non-zero, it is used on drawing rather than mActualScale

    float mZoomScale;

    float mInvInitialZoomScale;

    float mInvFinalZoomScale;

    int mInitialScrollX;

    int mInitialScrollY;

    long mZoomStart;

    static final int ZOOM_ANIMATION_LENGTH = 500;



    public ZoomManager(WebView webView, CallbackProxy callbackProxy) {

        mWebView = webView;

        mCallbackProxy = callbackProxy;

    }



    public void init(float density) {

        DEFAULT_MAX_ZOOM_SCALE = 4.0f * density;

        DEFAULT_MIN_ZOOM_SCALE = 0.25f * density;

        setDefaultZoomScale(density);

        mMaxZoomScale = DEFAULT_MAX_ZOOM_SCALE;

        mMinZoomScale = DEFAULT_MIN_ZOOM_SCALE;

        mActualScale = density;

        mInvActualScale = 1 / density;

        mTextWrapScale = density;

    }



    public void updateDefaultZoomDensity(float density) {

        if (Math.abs(density - mDefaultScale) > MINIMUM_SCALE_INCREMENT) {

            float scaleFactor = density / mDefaultScale;

            // set the new default density

            setDefaultZoomScale(density);

            // adjust the limits

            mMaxZoomScale *= scaleFactor;

            mMinZoomScale *= scaleFactor;

            setZoomScale(mActualScale * scaleFactor, true);

        }

    }



    private void setDefaultZoomScale(float defaultScale) {

        mDefaultScale = defaultScale;

        DEFAULT_MAX_ZOOM_SCALE = 4.0f * defaultScale;

        DEFAULT_MIN_ZOOM_SCALE = 0.25f * defaultScale;

    }



    public void setZoomCenter(float x, float y) {

        mZoomCenterX = x;

        mZoomCenterY = y;

    }



    public static final boolean exceedsMinScaleIncrement(float scaleA, float scaleB) {

        return Math.abs(scaleA - scaleB) >= MINIMUM_SCALE_INCREMENT;

    }



    public boolean willScaleTriggerZoom(float scale) {

        return exceedsMinScaleIncrement(scale, mActualScale);

    }



    public boolean isZoomedOut() {

        return mActualScale - mMinZoomScale <= MINIMUM_SCALE_INCREMENT;

    }



    public boolean isZoomAnimating() {

        return mZoomScale != 0;

    }



    public boolean zoomIn() {

        mInZoomOverview = false;

        return zoom(1.25f);

    }



    public boolean zoomOut() {

        return zoom(0.8f);

    }



    // returns TRUE if zoom out succeeds and FALSE if no zoom changes.

    private boolean zoom(float zoomMultiplier) {

        // TODO: alternatively we can disallow this during draw history mode

        mWebView.switchOutDrawHistory();

        // Center zooming to the center of the screen.

        mZoomCenterX = mWebView.getViewWidth() * .5f;

        mZoomCenterY = mWebView.getViewHeight() * .5f;

        int anchorX = mWebView.viewToContentX((int) mZoomCenterX + mWebView.getScrollX());

        int anchorY = mWebView.viewToContentY((int) mZoomCenterY + mWebView.getScrollY());

        mWebView.setViewSizeAnchor(anchorX, anchorY);

        return animateZoom(mActualScale * zoomMultiplier, true);

    }



    public void zoomToOverview() {

        mInZoomOverview = true;

        // Force the titlebar fully reveal in overview mode

        int scrollY = mWebView.getScrollY();

        if (scrollY < mWebView.getTitleHeight()) {

            mWebView.updateScrollCoordinates(mWebView.getScrollX(), 0);

        }

        animateZoom((float) mWebView.getViewWidth() / mZoomOverviewWidth, true);

    }



    public void zoomToDefaultLevel(boolean reflowText) {

        mInZoomOverview = false;

        animateZoom(mDefaultScale, reflowText);

    }



    public boolean animateZoom(float scale, boolean reflowText) {

        float oldScale = mActualScale;

        mInitialScrollX = mWebView.getScrollX();

        mInitialScrollY = mWebView.getScrollY();



        // snap to DEFAULT_SCALE if it is close

        if (!exceedsMinScaleIncrement(scale, mDefaultScale)) {

            scale = mDefaultScale;

        }



        setZoomScale(scale, reflowText);



        if (oldScale != mActualScale) {

            // use mZoomPickerScale to see zoom preview first

            mZoomStart = SystemClock.uptimeMillis();

            mInvInitialZoomScale = 1.0f / oldScale;

            mInvFinalZoomScale = 1.0f / mActualScale;

            mZoomScale = mActualScale;

            WebViewCore.pauseUpdatePicture(mWebView.getWebViewCore());

            mWebView.invalidate();

            return true;

        } else {

            return false;

        }

    }



    public void refreshZoomScale(boolean reflowText) {

        setZoomScale(mActualScale, reflowText, true);

    }



    public void setZoomScale(float scale, boolean reflowText) {

        setZoomScale(scale, reflowText, false);

    }



    private void setZoomScale(float scale, boolean reflowText, boolean force) {

        if (scale < mMinZoomScale) {

            scale = mMinZoomScale;

            // set mInZoomOverview for non mobile sites

            if (scale < mDefaultScale) {

                mInZoomOverview = true;

            }

        } else if (scale > mMaxZoomScale) {

            scale = mMaxZoomScale;

        }



        if (reflowText) {

            mTextWrapScale = scale;

        }



        if (scale != mActualScale || force) {

            float oldScale = mActualScale;

            float oldInvScale = mInvActualScale;



            if (scale != mActualScale && !mPreviewZoomOnly) {

                mCallbackProxy.onScaleChanged(mActualScale, scale);

            }



            mActualScale = scale;

            mInvActualScale = 1 / scale;



            if (!mWebView.drawHistory()) {



                // If history Picture is drawn, don't update scroll. They will

                // be updated when we get out of that mode.

                // update our scroll so we don't appear to jump

                // i.e. keep the center of the doc in the center of the view

                int oldX = mWebView.getScrollX();

                int oldY = mWebView.getScrollY();

                float ratio = scale * oldInvScale;

                float sx = ratio * oldX + (ratio - 1) * mZoomCenterX;

                float sy = ratio * oldY + (ratio - 1)

                        * (mZoomCenterY - mWebView.getTitleHeight());



                // Scale all the child views

                mWebView.mViewManager.scaleAll();



                // as we don't have animation for scaling, don't do animation

                // for scrolling, as it causes weird intermediate state

                int scrollX = mWebView.pinLocX(Math.round(sx));

                int scrollY = mWebView.pinLocY(Math.round(sy));

                if(!mWebView.updateScrollCoordinates(scrollX, scrollY)) {

                    // the scroll position is adjusted at the beginning of the

                    // zoom animation. But we want to update the WebKit at the

                    // end of the zoom animation. See comments in onScaleEnd().

                    mWebView.sendOurVisibleRect();

                }

            }



            // if the we need to reflow the text then force the VIEW_SIZE_CHANGED

            // event to be sent to WebKit

            mWebView.sendViewSizeZoom(reflowText);

        }

    }



    private ZoomControlBase getCurrentZoomControl() {