Index: content/browser/renderer_host/render_widget_host_view_android.cc |
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc |
index e6a59122f152af7a3767183e7ac6ab8e34fddf05..308202da4cf1c72250985905bf6751f6e567a919 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_android.cc |
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc |
@@ -1321,10 +1321,6 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated( |
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); |
@@ -1561,20 +1557,16 @@ InputEventAckState RenderWidgetHostViewAndroid::FilterInputEvent( |
static_cast<const blink::WebGestureEvent&>(input_event); |
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; |
- } |
+ selection_controller_->WillHandleLongPressEvent( |
+ base::TimeTicks() + |
+ base::TimeDelta::FromSecondsD(input_event.timeStampSeconds), |
+ gfx::PointF(gesture_event.x, gesture_event.y)); |
break; |
case blink::WebInputEvent::GestureTap: |
- if (selection_controller_->WillHandleTapEvent( |
- gfx::PointF(gesture_event.x, gesture_event.y), |
- gesture_event.data.tap.tapCount)) { |
- return INPUT_EVENT_ACK_STATE_CONSUMED; |
- } |
+ selection_controller_->WillHandleTapEvent( |
+ gfx::PointF(gesture_event.x, gesture_event.y), |
+ gesture_event.data.tap.tapCount); |
break; |
case blink::WebInputEvent::GestureScrollBegin: |
@@ -1946,11 +1938,6 @@ 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) { |