| Index: content/browser/android/content_view_core_impl.cc
|
| diff --git a/content/browser/android/content_view_core_impl.cc b/content/browser/android/content_view_core_impl.cc
|
| index 00b3442010290dafd518dcdc525b0d1ad4100529..4cb6da8994f4dd65a52654b0104c558c83adf513 100644
|
| --- a/content/browser/android/content_view_core_impl.cc
|
| +++ b/content/browser/android/content_view_core_impl.cc
|
| @@ -505,12 +505,13 @@ void ContentViewCoreImpl::ConfirmTouchEvent(InputEventAckState ack_result) {
|
| static_cast<jint>(ack_result));
|
| }
|
|
|
| -void ContentViewCoreImpl::UnhandledFlingStartEvent() {
|
| +void ContentViewCoreImpl::OnFlingStartEventAck(InputEventAckState ack_result) {
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
|
| if (j_obj.is_null())
|
| return;
|
| - Java_ContentViewCore_unhandledFlingStartEvent(env, j_obj.obj());
|
| + Java_ContentViewCore_onFlingStartEventAck(env, j_obj.obj(),
|
| + static_cast<jint>(ack_result));
|
| }
|
|
|
| void ContentViewCoreImpl::OnScrollUpdateGestureConsumed() {
|
| @@ -678,6 +679,14 @@ bool ContentViewCoreImpl::ShouldBlockMediaRequest(const GURL& url) {
|
| j_url.obj());
|
| }
|
|
|
| +void ContentViewCoreImpl::DidStopFlinging() {
|
| + JNIEnv* env = AttachCurrentThread();
|
| +
|
| + ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
|
| + if (!obj.is_null())
|
| + Java_ContentViewCore_onNativeFlingStopped(env, obj.obj());
|
| +}
|
| +
|
| gfx::Size ContentViewCoreImpl::GetPhysicalBackingSize() const {
|
| JNIEnv* env = AttachCurrentThread();
|
| ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
|
|
|