Make GestureTextSelector detect its own gestures

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 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/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/build_info.h"
 #include "base/basictypes.h"
@@ skipping 678 matching lines @@
 
 bool RenderWidgetHostViewAndroid::OnTouchEvent(
     const ui::MotionEvent& event) {
   if (!host_)
     return false;
 
   if (selection_controller_ &&
       selection_controller_->WillHandleTouchEvent(event))
     return true;
 
+  if (gesture_text_selector_.OnTouchEvent(event))
+    return true;
+
   if (!gesture_provider_.OnTouchEvent(event))
     return false;
 
-  if (gesture_text_selector_.OnTouchEvent(event)) {
-    gesture_provider_.OnTouchEventAck(false);
-    return true;
-  }
-
   if (host_->ShouldForwardTouchEvent()) {
     blink::WebTouchEvent web_event = CreateWebTouchEventFromMotionEvent(event);
     host_->ForwardTouchEventWithLatencyInfo(web_event,
                                             CreateLatencyInfo(web_event));
   } else {
     const bool event_consumed = false;
     gesture_provider_.OnTouchEventAck(event_consumed);
   }
 
   // Send a proactive BeginFrame on the next vsync to reduce latency.
@@ skipping 872 matching lines @@
 
 void RenderWidgetHostViewAndroid::RunAckCallbacks() {
   while (!ack_callbacks_.empty()) {
     ack_callbacks_.front().Run();
     ack_callbacks_.pop();
   }
 }
 
 void RenderWidgetHostViewAndroid::OnGestureEvent(
     const ui::GestureEventData& gesture) {
-  if (gesture_text_selector_.OnGestureEvent(gesture))
-    return;
-
   SendGestureEvent(CreateWebGestureEventFromGestureEventData(gesture));
 }
 
 void RenderWidgetHostViewAndroid::OnCompositingDidCommit() {
   RunAckCallbacks();
 }
 
-
 void RenderWidgetHostViewAndroid::OnAttachCompositor() {
   DCHECK(content_view_core_);
   if (overscroll_effect_enabled_ && !overscroll_effect_)
     overscroll_effect_ = CreateOverscrollEffect(content_view_core_);
 }
 
 void RenderWidgetHostViewAndroid::OnDetachCompositor() {
   DCHECK(content_view_core_);
   DCHECK(!using_synchronous_compositor_);
   RunAckCallbacks();
@@ skipping 135 matching lines @@
     selection_controller_->OnLongPressEvent();
 }
 
 void RenderWidgetHostViewAndroid::SelectRange(
     float x1, float y1, float x2, float y2) {
   if (content_view_core_)
     static_cast<WebContentsImpl*>(content_view_core_->GetWebContents())->
         SelectRange(gfx::Point(x1, y1), gfx::Point(x2, y2));
 }
 
-void RenderWidgetHostViewAndroid::Unselect() {
-  if (content_view_core_)
-    content_view_core_->GetWebContents()->Unselect();
-}
-
 void RenderWidgetHostViewAndroid::LongPress(
     base::TimeTicks time, float x, float y) {
   blink::WebGestureEvent long_press = WebGestureEventBuilder::Build(
       blink::WebInputEvent::GestureLongPress,
       (time - base::TimeTicks()).InSecondsF(), x, y);
   SendGestureEvent(long_press);
 }
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(
     blink::WebScreenInfo* results) {
   const gfx::Display& display =
       gfx::Screen::GetNativeScreen()->GetPrimaryDisplay();
   results->rect = display.bounds();
   // TODO(husky): Remove any system controls from availableRect.
   results->availableRect = display.work_area();
   results->deviceScaleFactor = display.device_scale_factor();
   results->orientationAngle = display.RotationAsDegree();
   results->orientationType =
       RenderWidgetHostViewBase::GetOrientationTypeForMobile(display);
   gfx::DeviceDisplayInfo info;
   results->depth = info.GetBitsPerPixel();
   results->depthPerComponent = info.GetBitsPerComponent();
   results->isMonochrome = (results->depthPerComponent == 0);
 }
 
 } // namespace content