Index: android_webview/native/aw_contents.cc |
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc |
index e0dc28c8c16792f3c683f7b3766f4cc69e8e0ef3..016a1b0fca645eaa69277e4bd6d1290617ece3c2 100644 |
--- a/android_webview/native/aw_contents.cc |
+++ b/android_webview/native/aw_contents.cc |
@@ -924,6 +924,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_CURRENTLY_ON(BrowserThread::UI); |
return reinterpret_cast<intptr_t>(pending_contents_.release()); |
@@ -983,14 +992,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_CURRENTLY_ON(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()); |
+ Java_AwContents_didOverscroll(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) { |