Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1695)

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.cc

Issue 2201853002: Blink handle selection handle visibility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed contextual search test function Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 9e33733cc4b55e355ebe6a7236dd285ac4695e6c..662c8f0b19e1320612ba53368abaf0bd94781b50 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -1324,10 +1324,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);
@@ -1564,20 +1560,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:
@@ -1716,11 +1708,8 @@ void RenderWidgetHostViewAndroid::OnShowingPastePopup(
insertion_bound.set_visible(true);
insertion_bound.SetEdge(point, point);
selection_controller_->HideAndDisallowShowingAutomatically();
- selection_controller_->OnSelectionEditable(true);
- selection_controller_->OnSelectionEmpty(true);
selection_controller_->OnSelectionBoundsChanged(insertion_bound,
insertion_bound);
- selection_controller_->AllowShowingFromCurrentSelection();
}
SkColor RenderWidgetHostViewAndroid::GetCachedBackgroundColor() const {
@@ -1957,11 +1946,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) {

Powered by Google App Engine
This is Rietveld 408576698