Plumb smooth scrolling in Chromium compositor

content/public/android/java/src/org/chromium/content/browser/ContentViewCore.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.content.browser;
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.app.Activity;
 import android.app.SearchManager;
@@ skipping 1227 matching lines @@
         // touch pipline, so we ignore them entirely.
         return eventAction == MotionEvent.ACTION_DOWN
                 || eventAction == MotionEvent.ACTION_UP
                 || eventAction == MotionEvent.ACTION_CANCEL
                 || eventAction == MotionEvent.ACTION_MOVE
                 || eventAction == MotionEvent.ACTION_POINTER_DOWN
                 || eventAction == MotionEvent.ACTION_POINTER_UP;
     }
 
     public boolean isScrollInProgress() {
-        return mTouchScrollInProgress || mPotentiallyActiveFlingCount > 0
-                || getContentViewClient().isExternalScrollActive();
+        return mTouchScrollInProgress || mPotentiallyActiveFlingCount > 0;
     }
 
     @SuppressWarnings("unused")
     @CalledByNative
     private void onFlingStartEventConsumed(int vx, int vy) {
         mTouchScrollInProgress = false;
         mPotentiallyActiveFlingCount++;
         for (mGestureStateListenersIterator.rewind();
                     mGestureStateListenersIterator.hasNext();) {
             mGestureStateListenersIterator.next().onFlingStartGesture(
@@ skipping 88 matching lines @@
         nativeDoubleTap(mNativeContentViewCore, timeMs, x, y);
     }
 
     public void flingViewport(long timeMs, int velocityX, int velocityY) {
         if (mNativeContentViewCore == 0) return;
         nativeFlingCancel(mNativeContentViewCore, timeMs);
         nativeScrollBegin(mNativeContentViewCore, timeMs, 0, 0, velocityX, velocityY, true);
         nativeFlingStart(mNativeContentViewCore, timeMs, 0, 0, velocityX, velocityY, true);
     }
 
+    public void smoothScroll(int targetX, int targetY, long durationMs) {

[jdduke (slow), 2015/07/28 15:54:31]

Nit: Javadoc.

[hush (inactive), 2015/07/28 21:36:46]

Done.

+        mWebContents.smoothScroll(targetX, targetY, durationMs);
+    }
+
     /**
      * Cancel any fling gestures active.
      * @param timeMs Current time (in milliseconds).
      */
     public void cancelFling(long timeMs) {
         if (mNativeContentViewCore == 0) return;
         nativeFlingCancel(mNativeContentViewCore, timeMs);
     }
 
     /**
@@ skipping 21 matching lines @@
                     listener.onPinchStarted();
                     break;
                 case GestureEventType.PINCH_END:
                     listener.onPinchEnded();
                     break;
                 case GestureEventType.FLING_END:
                     listener.onFlingEndGesture(
                             computeVerticalScrollOffset(),
                             computeVerticalScrollExtent());
                     break;
-                case GestureEventType.FLING_CANCEL:
-                    listener.onFlingCancelGesture();
-                    break;
                 case GestureEventType.SCROLL_START:
                     listener.onScrollStarted(
                             computeVerticalScrollOffset(),
                             computeVerticalScrollExtent());
                     break;
                 case GestureEventType.SCROLL_END:
                     listener.onScrollEnded(
                             computeVerticalScrollOffset(),
                             computeVerticalScrollExtent());
                     break;
@@ skipping 1902 matching lines @@
     private native void nativeSetTextTrackSettings(long nativeContentViewCoreImpl,
             boolean textTracksEnabled, String textTrackBackgroundColor, String textTrackFontFamily,
             String textTrackFontStyle, String textTrackFontVariant, String textTrackTextColor,
             String textTrackTextShadow, String textTrackTextSize);
 
     private native void nativeExtractSmartClipData(long nativeContentViewCoreImpl,
             int x, int y, int w, int h);
 
     private native void nativeSetBackgroundOpaque(long nativeContentViewCoreImpl, boolean opaque);
 }