NOT FOR LANDING - [WebView] Allow fling animation via the LayerScrollOffsetDelegate

android_webview/native/aw_contents.cc

Index: android_webview/native/aw_contents.cc
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 858047820c966a20833a69fe0c0db2e6879a8c5a..757ff2e327351f5519bb3f820f00ef932bfc4742 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -920,6 +920,15 @@ void AwContents::SetBackgroundColor(JNIEnv* env, jobject obj, jint color) {
   render_view_host_ext_->SetBackgroundColor(color);
 }
 
+void AwContents::OnComputeScroll(JNIEnv* env,
+                                 jobject obj,
+                                 jlong animation_time_millis) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  browser_view_renderer_.OnComputeScroll(
+      base::TimeTicks() +
+      base::TimeDelta::FromMilliseconds(animation_time_millis));
+}
+
 jlong AwContents::ReleasePopupAwContents(JNIEnv* env, jobject obj) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   return reinterpret_cast<intptr_t>(pending_contents_.release());
@@ -979,14 +988,19 @@ void AwContents::UpdateScrollState(gfx::Vector2d max_scroll_offset,
                                     max_page_scale_factor);
 }
 
-void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta) {
+void AwContents::DidOverscroll(gfx::Vector2d overscroll_delta,
+                               gfx::Vector2dF overscroll_velocity,
+                               bool first_overscroll_x,
+                               bool first_overscroll_y) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return;
   Java_AwContents_didOverscroll(
-      env, obj.obj(), overscroll_delta.x(), overscroll_delta.y());
+      env, obj.obj(), overscroll_delta.x(), overscroll_delta.y(),
+      overscroll_velocity.x(), overscroll_velocity.y(),
+      first_overscroll_x, first_overscroll_y);
 }
 
 void AwContents::SetDipScale(JNIEnv* env, jobject obj, jfloat dip_scale) {