Revert "Blink handle selection handle visibility"

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 <utility>
 
@@ skipping 1321 matching lines @@
   bool is_mobile_optimized = IsMobileOptimizedFrame(frame_metadata);
   gesture_provider_.SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
 
   if (!content_view_core_)
     return;
 
   if (overscroll_controller_)
     overscroll_controller_->OnFrameMetadataUpdated(frame_metadata);
 
   if (selection_controller_) {
+    selection_controller_->OnSelectionEditable(
+        frame_metadata.selection.is_editable);
+    selection_controller_->OnSelectionEmpty(
+        frame_metadata.selection.is_empty_text_form_control);
     selection_controller_->OnSelectionBoundsChanged(
         frame_metadata.selection.start, frame_metadata.selection.end);
 
     // Set parameters for adaptive handle orientation.
     gfx::SizeF viewport_size(frame_metadata.scrollable_viewport_size);
     viewport_size.Scale(frame_metadata.page_scale_factor);
     gfx::RectF viewport_rect(0.0f, frame_metadata.top_controls_height *
                                        frame_metadata.top_controls_shown_ratio,
                              viewport_size.width(), viewport_size.height());
     selection_controller_->OnViewportChanged(viewport_rect);
@@ skipping 232 matching lines @@
 }
 
 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);
     switch (gesture_event.type()) {
       case blink::WebInputEvent::GestureLongPress:
-        selection_controller_->HandleLongPressEvent(
-            base::TimeTicks() +
-            base::TimeDelta::FromSecondsD(input_event.timeStampSeconds()),
-            gfx::PointF(gesture_event.x, gesture_event.y));
+        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:
-        selection_controller_->HandleTapEvent(
-            gfx::PointF(gesture_event.x, gesture_event.y),
-            gesture_event.data.tap.tapCount);
+        if (selection_controller_->WillHandleTapEvent(
+                gfx::PointF(gesture_event.x, gesture_event.y),
+                gesture_event.data.tap.tapCount)) {
+          return INPUT_EVENT_ACK_STATE_CONSUMED;
+        }
         break;
 
       case blink::WebInputEvent::GestureScrollBegin:
         selection_controller_->OnScrollBeginEvent();
         break;
 
       default:
         break;
     }
   }
@@ skipping 376 matching lines @@
                                                       float y0,
                                                       float x1,
                                                       float y1) {
   SelectBetweenCoordinates(gfx::PointF(x0, y0), gfx::PointF(x1, y1));
 }
 
 void RenderWidgetHostViewAndroid::OnStylusSelectUpdate(float x, float y) {
   MoveRangeSelectionExtent(gfx::PointF(x, y));
 }
 
+void RenderWidgetHostViewAndroid::OnStylusSelectEnd() {
+  if (selection_controller_)
+    selection_controller_->AllowShowingFromCurrentSelection();
+}
+
 void RenderWidgetHostViewAndroid::OnStylusSelectTap(base::TimeTicks time,
                                                     float x,
                                                     float y) {
   // Treat the stylus tap as a long press, activating either a word selection or
   // context menu depending on the targetted content.
   blink::WebGestureEvent long_press = WebGestureEventBuilder::Build(
       blink::WebInputEvent::GestureLongPress,
       (time - base::TimeTicks()).InSecondsF(), x, y);
   SendGestureEvent(long_press);
 }
@@ skipping 57 matching lines @@
   ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor,
       ui::GetScaleFactorForNativeView(GetNativeView()));
 }
 
 }  // namespace content