Plumb smooth scrolling in Chromium compositor

android_webview/java/src/org/chromium/android_webview/AwContents.java

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.android_webview;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
@@ skipping 22 matching lines @@
 import android.view.ViewGroup;
 import android.view.accessibility.AccessibilityEvent;
 import android.view.accessibility.AccessibilityNodeInfo;
 import android.view.accessibility.AccessibilityNodeProvider;
 import android.view.animation.AnimationUtils;
 import android.view.inputmethod.EditorInfo;
 import android.view.inputmethod.InputConnection;
 import android.webkit.GeolocationPermissions;
 import android.webkit.JavascriptInterface;
 import android.webkit.ValueCallback;
-import android.widget.OverScroller;
 
 import org.chromium.android_webview.permission.AwPermissionRequest;
 import org.chromium.base.CalledByNative;
 import org.chromium.base.JNINamespace;
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;
@@ skipping 127 matching lines @@
     /**
      * Class to facilitate dependency injection. Subclasses by test code to provide mock versions of
      * certain AwContents dependencies.
      */
     public static class DependencyFactory {
         public AwLayoutSizer createLayoutSizer() {
             return new AwLayoutSizer();
         }
 
         public AwScrollOffsetManager createScrollOffsetManager(
-                AwScrollOffsetManager.Delegate delegate, OverScroller overScroller) {
-            return new AwScrollOffsetManager(delegate, overScroller);
+                AwScrollOffsetManager.Delegate delegate) {
+            return new AwScrollOffsetManager(delegate);
         }
     }
 
     /**
      * Visual state callback, see {@link #insertVisualStateCallback} for details.
      *
      */
     @VisibleForTesting
     public abstract static class VisualStateCallback {
         /**
@@ skipping 353 matching lines @@
         public void scrollContainerViewTo(int x, int y) {
             mInternalAccessAdapter.super_scrollTo(x, y);
         }
 
         @Override
         public void scrollNativeTo(int x, int y) {
             if (!isDestroyed()) nativeScrollTo(mNativeAwContents, x, y);
         }
 
         @Override
+        public void smoothScroll(
+                long currentMs, int startX, int startY, int dx, int dy, long durationMs) {
+            mContentViewCore.smoothScroll(startX + dx, startY + dy, durationMs);
+        }
+
+        @Override
         public int getContainerViewScrollX() {
             return mContainerView.getScrollX();
         }
 
         @Override
         public int getContainerViewScrollY() {
             return mContainerView.getScrollY();
         }
 
         @Override
@@ skipping 19 matching lines @@
             // WebViewClassic does.
             mLayoutSizer.freezeLayoutRequests();
         }
 
         @Override
         public void onPinchEnded() {
             mLayoutSizer.unfreezeLayoutRequests();
         }
 
         @Override
-        public void onFlingCancelGesture() {
-            mScrollOffsetManager.finishScroll();
-        }
-
-        @Override
         public void onScrollUpdateGestureConsumed() {
             mScrollAccessibilityHelper.postViewScrolledAccessibilityEventCallback();
         }
     }
 
     //--------------------------------------------------------------------------------------------
     private class AwComponentCallbacks implements ComponentCallbacks2 {
         @Override
         public void onTrimMemory(final int level) {
             if (isDestroyed()) return;
@@ skipping 79 matching lines @@
                         mContentViewCore.updateDoubleTapSupport(supportsDoubleTapZoom);
                         mContentViewCore.updateMultiTouchZoomSupport(supportsMultiTouchZoom);
                     }
 
                 };
         mSettings.setZoomListener(zoomListener);
         mDefaultVideoPosterRequestHandler = new DefaultVideoPosterRequestHandler(mContentsClient);
         mSettings.setDefaultVideoPosterURL(
                 mDefaultVideoPosterRequestHandler.getDefaultVideoPosterURL());
         mSettings.setDIPScale(mDIPScale);
-        mScrollOffsetManager = dependencyFactory.createScrollOffsetManager(
-                new AwScrollOffsetManagerDelegate(), new OverScroller(mContext));
+        mScrollOffsetManager =
+                dependencyFactory.createScrollOffsetManager(new AwScrollOffsetManagerDelegate());
         mScrollAccessibilityHelper = new ScrollAccessibilityHelper(mContainerView);
 
         setOverScrollMode(mContainerView.getOverScrollMode());
         setScrollBarStyle(mInternalAccessAdapter.super_getScrollBarStyle());
 
         setNewAwContents(nativeInit(mBrowserContext));
 
         onContainerViewChanged();
     }
 
@@ skipping 1221 matching lines @@
      */
     public float getScale() {
         return (float) (mPageScaleFactor * mDIPScale);
     }
 
     /**
      * @see android.webkit.WebView#flingScroll(int, int)
      */
     public void flingScroll(int velocityX, int velocityY) {
         if (TRACE) Log.d(TAG, "flingScroll");
-        // Cancel the current smooth scroll, if there is one.
-        mScrollOffsetManager.finishScroll();
-        // TODO(hush): crbug.com/493765. A hit test at 0, 0 may not
-        // target the scroll at root scrolling layer.  Instead, we
-        // should add a method flingRootLayer to ContentViewCore
-        // and call it here to specifically target the scroll at
-        // the root layer.
         mContentViewCore.flingViewport(SystemClock.uptimeMillis(), -velocityX, -velocityY);
     }
 
     /**
      * @see android.webkit.WebView#pageUp(boolean)
      */
     public boolean pageUp(boolean top) {
         if (TRACE) Log.d(TAG, "pageUp");
         return mScrollOffsetManager.pageUp(top);
     }
@@ skipping 613 matching lines @@
         // This change notification comes from the renderer thread, not from the cc/ impl thread.
         mLayoutSizer.onContentSizeChanged(widthCss, heightCss);
     }
 
     @CalledByNative
     private void scrollContainerViewTo(int x, int y) {
         mScrollOffsetManager.scrollContainerViewTo(x, y);
     }
 
     @CalledByNative
-    public boolean isSmoothScrollingActive() {
-        return mScrollOffsetManager.isSmoothScrollingActive();
-    }
-
-    @CalledByNative
     private void updateScrollState(int maxContainerViewScrollOffsetX,
             int maxContainerViewScrollOffsetY, int contentWidthDip, int contentHeightDip,
             float pageScaleFactor, float minPageScaleFactor, float maxPageScaleFactor) {
         mContentWidthDip = contentWidthDip;
         mContentHeightDip = contentHeightDip;
         mScrollOffsetManager.setMaxScrollOffset(maxContainerViewScrollOffsetX,
                 maxContainerViewScrollOffsetY);
         setPageScaleFactorAndLimits(pageScaleFactor, minPageScaleFactor, maxPageScaleFactor);
     }
 
@@ skipping 422 matching lines @@
             return mScrollOffsetManager.computeVerticalScrollOffset();
         }
 
         @Override
         public int computeVerticalScrollExtent() {
             return mScrollOffsetManager.computeVerticalScrollExtent();
         }
 
         @Override
         public void computeScroll() {
-            if (mScrollOffsetManager.isSmoothScrollingActive()) {
-                mScrollOffsetManager.computeScrollAndAbsorbGlow(mOverScrollGlow);
-            } else {
-                if (isDestroyed()) return;
-                nativeOnComputeScroll(
-                        mNativeAwContents, AnimationUtils.currentAnimationTimeMillis());
-            }
+            if (isDestroyed()) return;
+            nativeOnComputeScroll(mNativeAwContents, AnimationUtils.currentAnimationTimeMillis());
         }
     }
 
     // Return true if the GeolocationPermissionAPI should be used.
     @CalledByNative
     private boolean useLegacyGeolocationPermissionAPI() {
         // Always return true since we are not ready to swap the geolocation yet.
         // TODO: If we decide not to migrate the geolocation, there are some unreachable
         // code need to remove. http://crbug.com/396184.
         return true;
@@ skipping 79 matching lines @@
     private native void nativeCreatePdfExporter(long nativeAwContents, AwPdfExporter awPdfExporter);
 
     private native void nativePreauthorizePermission(long nativeAwContents, String origin,
             long resources);
 
     private native void nativePostMessageToFrame(long nativeAwContents, String frameId,
             String message, String targetOrigin, int[] msgPorts);
 
     private native void nativeCreateMessageChannel(long nativeAwContents, AwMessagePort[] ports);
 }