Support longpress drag selection

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 764 matching lines @@
 
 bool RenderWidgetHostViewAndroid::OnTouchHandleEvent(
     const ui::MotionEvent& event) {
   return selection_controller_ &&
          selection_controller_->WillHandleTouchEvent(event);
 }
 
 void RenderWidgetHostViewAndroid::ResetGestureDetection() {
   const ui::MotionEvent* current_down_event =
       gesture_provider_.GetCurrentDownEvent();
-  if (current_down_event) {
-    scoped_ptr<ui::MotionEvent> cancel_event = current_down_event->Cancel();
-    OnTouchEvent(*cancel_event);
+  if (!current_down_event) {
+    // A hard reset ensures prevention of any timer-based events that might fire
+    // after a touch sequence has ended.
+    gesture_provider_.ResetDetection();
+    return;
   }
 
-  // A hard reset ensures prevention of any timer-based events.
-  gesture_provider_.ResetDetection();
+  scoped_ptr<ui::MotionEvent> cancel_event = current_down_event->Cancel();
+  if (gesture_provider_.OnTouchEvent(*cancel_event).succeeded) {
+    bool causes_scrolling = false;
+    host_->ForwardTouchEventWithLatencyInfo(
+        ui::CreateWebTouchEventFromMotionEvent(*cancel_event, causes_scrolling),
+        ui::LatencyInfo());
+  }
 }
 
 void RenderWidgetHostViewAndroid::OnDidNavigateMainFrameToNewPage() {
   ResetGestureDetection();
 }
 
 void RenderWidgetHostViewAndroid::SetDoubleTapSupportEnabled(bool enabled) {
   gesture_provider_.SetDoubleTapSupportForPlatformEnabled(enabled);
 }
 
@@ skipping 454 matching lines @@
     const gfx::PointF& base,
     const gfx::PointF& extent) {
   DCHECK(content_view_core_);
   content_view_core_->SelectBetweenCoordinates(base, extent);
 }
 
 void RenderWidgetHostViewAndroid::OnSelectionEvent(
     ui::SelectionEventType event) {
   DCHECK(content_view_core_);
   DCHECK(selection_controller_);
-  // Showing the selection action bar can alter the current View coordinates in
-  // such a way that the current MotionEvent stream is suddenly shifted in
-  // space. Avoid the associated scroll jump by pre-emptively cancelling gesture
-  // detection; scrolling after the selection is activated is unnecessary.
-  if (event == ui::SelectionEventType::SELECTION_SHOWN)
+  // If a selection drag has started, it has taken over the active touch
+  // sequence. Immediately cancel gesture detection and any downstream touch
+  // listeners (e.g., web content) to communicate this transfer.
+  if (event == ui::SELECTION_SHOWN)
     ResetGestureDetection();
+
   content_view_core_->OnSelectionEvent(
       event, selection_controller_->GetStartPosition(),
       GetSelectionRect(*selection_controller_));
 }
 
 scoped_ptr<ui::TouchHandleDrawable>
 RenderWidgetHostViewAndroid::CreateDrawable() {
   DCHECK(content_view_core_);
   if (!using_browser_compositor_)
     return content_view_core_->CreatePopupTouchHandleDrawable();
@@ skipping 297 matching lines @@
   if (content_view_core_)
     content_view_core_->OnGestureEventAck(event, ack_result);
 }
 
 InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent(
     const blink::WebInputEvent& input_event) {
   if (selection_controller_ &&
       blink::WebInputEvent::isGestureEventType(input_event.type)) {
     const blink::WebGestureEvent& gesture_event =
         static_cast<const blink::WebGestureEvent&>(input_event);
-    gfx::PointF gesture_location(gesture_event.x, gesture_event.y);
-    if (input_event.type == blink::WebInputEvent::GestureLongPress) {
-      if (selection_controller_->WillHandleLongPressEvent(gesture_location))
-        return INPUT_EVENT_ACK_STATE_CONSUMED;
-    } else if (input_event.type == blink::WebInputEvent::GestureTap) {
-      if (selection_controller_->WillHandleTapEvent(gesture_location))
-        return INPUT_EVENT_ACK_STATE_CONSUMED;
+    switch (gesture_event.type) {
+      case blink::WebInputEvent::GestureLongPress:
+        if (selection_controller_->WillHandleLongPressEvent(
+                base::TimeTicks() +
+                    base::TimeDelta::FromSecondsD(input_event.timeStampSeconds),
+                gfx::PointF(gesture_event.x, gesture_event.y))) {
+          return INPUT_EVENT_ACK_STATE_CONSUMED;
+        }
+        break;
+
+      case blink::WebInputEvent::GestureTap:
+        if (selection_controller_->WillHandleTapEvent(
+                gfx::PointF(gesture_event.x, gesture_event.y))) {
+          return INPUT_EVENT_ACK_STATE_CONSUMED;
+        }
+        break;
+
+      default:
+        break;
     }
   }
 
   if (overscroll_controller_ &&
       blink::WebInputEvent::isGestureEventType(input_event.type) &&
       overscroll_controller_->WillHandleGestureEvent(
           static_cast<const blink::WebGestureEvent&>(input_event))) {
     return INPUT_EVENT_ACK_STATE_CONSUMED;
   }
 
@@ skipping 410 matching lines @@
   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