Rename GestureEventQueue to TouchDispositionGestureFilter

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 241 matching lines @@
       web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       root_layer_(cc::Layer::Create()),
       vsync_interval_(base::TimeDelta::FromMicroseconds(
           kDefaultVSyncIntervalMicros)),
       expected_browser_composite_time_(base::TimeDelta::FromMicroseconds(
           kDefaultVSyncIntervalMicros * kDefaultBrowserCompositeVSyncFraction)),
       view_android_(view_android),
       window_android_(window_android),
       device_orientation_(0),
       geolocation_needs_pause_(false),
-      gesture_event_queue_(this),
+      touch_disposition_gesture_filter_(this),
       handling_touch_event_(false) {
   CHECK(web_contents) <<
       "A ContentViewCoreImpl should be created with a valid WebContents.";
 
   const gfx::Display& display =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
   dpi_scale_ = display.device_scale_factor();
 
   // Currently, the only use case we have for overriding a user agent involves
   // spoofing a desktop Linux user agent for "Request desktop site".
@@ skipping 306 matching lines @@
     env->SetIntArrayRegion(enabled_array.obj(), i, 1, &enabled);
   }
   ScopedJavaLocalRef<jobjectArray> items_array(
       base::android::ToJavaArrayOfStrings(env, labels));
   Java_ContentViewCore_showSelectPopup(env, j_obj.obj(),
                                        items_array.obj(), enabled_array.obj(),
                                        multiple, selected_array.obj());
 }
 
 void ContentViewCoreImpl::ConfirmTouchEvent(InputEventAckState ack_result) {
-  gesture_event_queue_.OnTouchEventAck(ack_result);
+  touch_disposition_gesture_filter_.OnTouchEventAck(ack_result);
 }
 
 void ContentViewCoreImpl::OnGestureEventAck(const blink::WebGestureEvent& event,
                                             InputEventAckState ack_result) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
 
   switch (event.type) {
@@ skipping 444 matching lines @@
 
 void ContentViewCoreImpl::OnTouchEventHandlingEnd(JNIEnv* env, jobject obj) {
   DCHECK(handling_touch_event_);
   handling_touch_event_ = false;
 
   RenderWidgetHostViewAndroid* rwhv = GetRenderWidgetHostViewAndroid();
   if (!rwhv)
     return;
 
   // Note: Order is important here, as the touch may be ack'ed synchronously
-  gesture_event_queue_.OnGestureEventPacket(pending_gesture_packet_);
+  touch_disposition_gesture_filter_.OnGestureEventPacket(
+      pending_gesture_packet_);
   rwhv->SendTouchEvent(pending_touch_event_);
 }
 
 float ContentViewCoreImpl::GetTouchPaddingDip() {
   return 48.0f / GetDpiScale();
 }
 
 float ContentViewCoreImpl::GetDpiScale() const {
   return dpi_scale_;
 }
@@ skipping 52 matching lines @@
 WebGestureEvent ContentViewCoreImpl::MakeGestureEvent(
     WebInputEvent::Type type, int64 time_ms, float x, float y) const {
   return WebGestureEventBuilder::Build(
       type, time_ms / 1000.0, x / GetDpiScale(), y / GetDpiScale());
 }
 
 void ContentViewCoreImpl::SendGestureEvent(
     const blink::WebGestureEvent& event) {
   // Gestures received while |handling_touch_event_| will accumulate until
   // touch handling finishes, at which point the gestures will be pushed to the
-  // |gesture_event_queue_|.
+  // |touch_disposition_gesture_filter_|.
   if (handling_touch_event_) {
     pending_gesture_packet_.Push(event);
     return;
   }
 
   // TODO(jdduke): In general, timeout-based gestures *should* have the same
   // timestamp as the initial TouchStart of the current sequence. We should
   // verify that this is true, and use that as another timeout check.
   if (PossiblyTriggeredByTouchTimeout(event)) {
-    gesture_event_queue_.OnGestureEventPacket(
+    touch_disposition_gesture_filter_.OnGestureEventPacket(
         GestureEventPacket::FromTouchTimeout(event));
     return;
   }
 
   // If |event| was not (directly or indirectly) touch-derived, treat it as
   // a synthetic gesture event.
   SendSyntheticGestureEvent(event);
 }
 
 void ContentViewCoreImpl::SendSyntheticGestureEvent(
@@ skipping 720 matching lines @@
       reinterpret_cast<ui::ViewAndroid*>(view_android),
       reinterpret_cast<ui::WindowAndroid*>(window_android));
   return reinterpret_cast<intptr_t>(view);
 }
 
 bool RegisterContentViewCore(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content