Merge "Make sure pinch zoom and overview scale are within limits"

    }

    /* package */ float getZoomOverviewScale() {

        return mWebView.getViewWidth() * mInvZoomOverviewWidth;

        return computeScaleWithLimits(mWebView.getViewWidth() * mInvZoomOverviewWidth);

    }

    public boolean isInZoomOverview() {

        public boolean onScale(ScaleGestureDetector detector) {

            // Prevent scaling beyond overview scale.

            float scale = Math.max(detector.getScaleFactor() * mActualScale,

            float scale = Math.max(

                    computeScaleWithLimits(detector.getScaleFactor() * mActualScale),

                    getZoomOverviewScale());

            if (mPinchToZoomAnimating || willScaleTriggerZoom(scale)) {

                mPinchToZoomAnimating = true;

                } else {

                    scale = Math.max(scale, mActualScale * 0.8f);

                }

                scale = computeScaleWithLimits(scale);

                // if the scale change is too small, regard it as jitter and skip it.

                if (Math.abs(scale - mActualScale) < MINIMUM_SCALE_WITHOUT_JITTER) {

                    return false;