[Android] Properly filter GestureFlingCancel events

content/browser/android/content_view_core_impl.cc

 // 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.
 
 #include "content/browser/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 534 matching lines @@
           j_obj.obj(),
           ack_result == INPUT_EVENT_ACK_STATE_CONSUMED,
           event.x * dpi_scale(),
           event.y * dpi_scale());
       break;
     default:
       break;
   }
 }
 
-bool ContentViewCoreImpl::FilterInputEvent(const blink::WebInputEvent& event) {
+InputEventAckState ContentViewCoreImpl::FilterInputEvent(
+    const blink::WebInputEvent& event) {
   if (event.type != WebInputEvent::GestureTap &&
       event.type != WebInputEvent::GestureDoubleTap &&
       event.type != WebInputEvent::GestureLongTap &&
       event.type != WebInputEvent::GestureLongPress &&
-      event.type != WebInputEvent::GestureFlingCancel)
-    return false;
+      event.type != WebInputEvent::GestureFlingCancel) {
+    return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
+  }
 
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
-    return false;
+    return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
 
   if (event.type == WebInputEvent::GestureFlingCancel) {
     // If no fling is active, either in the compositor or externally-driven,
     // there's no need to explicitly cancel the fling.
     bool may_need_fling_cancel =
         Java_ContentViewCore_isScrollInProgress(env, j_obj.obj());
-    return !may_need_fling_cancel;
+    return may_need_fling_cancel ? INPUT_EVENT_ACK_STATE_NOT_CONSUMED
+                                 : INPUT_EVENT_ACK_STATE_NO_CONSUMER_EXISTS;
   }
 
   const blink::WebGestureEvent& gesture =
       static_cast<const blink::WebGestureEvent&>(event);
   int gesture_type = ToGestureEventType(event.type);
-  return Java_ContentViewCore_filterTapOrPressEvent(env,
-                                                    j_obj.obj(),
-                                                    gesture_type,
-                                                    gesture.x * dpi_scale(),
-                                                    gesture.y * dpi_scale());
+  if (Java_ContentViewCore_filterTapOrPressEvent(env,
+                                                 j_obj.obj(),
+                                                 gesture_type,
+                                                 gesture.x * dpi_scale(),
+                                                 gesture.y * dpi_scale())) {
+    return INPUT_EVENT_ACK_STATE_CONSUMED;
+  }
 
+  return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
   // TODO(jdduke): Also report double-tap UMA, crbug/347568.
 }
 
 bool ContentViewCoreImpl::HasFocus() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
   if (obj.is_null())
     return false;
   return Java_ContentViewCore_hasFocus(env, obj.obj());
 }
@@ skipping 830 matching lines @@
     return NULL;
 
   return view->GetJavaObject().Release();
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content