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

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

Issue 698253004: Reland: Implement Aura side of unified touch text selection for contents (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased after addition of touch_handle_orientation file Created 5 years, 10 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 339fec9359479b8e4d1c9ffaf578260748595c82..b8a7e322bc50d8531c385b0820eac02c8680ba44 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -46,6 +46,7 @@
#include "content/browser/renderer_host/dip_util.h"
#include "content/browser/renderer_host/frame_metadata_util.h"
#include "content/browser/renderer_host/input/synthetic_gesture_target_android.h"
+#include "content/browser/renderer_host/input/ui_touch_selection_helper.h"
#include "content/browser/renderer_host/input/web_input_event_builders_android.h"
#include "content/browser/renderer_host/input/web_input_event_util.h"
#include "content/browser/renderer_host/render_process_host_impl.h"
@@ -290,32 +291,6 @@ ui::GestureProvider::Config CreateGestureProviderConfig() {
return config;
}
-ui::SelectionBound::Type ConvertSelectionBoundType(
- cc::SelectionBoundType type) {
- switch (type) {
- case cc::SELECTION_BOUND_LEFT:
- return ui::SelectionBound::LEFT;
- case cc::SELECTION_BOUND_RIGHT:
- return ui::SelectionBound::RIGHT;
- case cc::SELECTION_BOUND_CENTER:
- return ui::SelectionBound::CENTER;
- case cc::SELECTION_BOUND_EMPTY:
- return ui::SelectionBound::EMPTY;
- }
- NOTREACHED() << "Unknown selection bound type";
- return ui::SelectionBound::EMPTY;
-}
-
-ui::SelectionBound ConvertSelectionBound(
- const cc::ViewportSelectionBound& bound) {
- ui::SelectionBound ui_bound;
- ui_bound.set_type(ConvertSelectionBoundType(bound.type));
- ui_bound.set_visible(bound.visible);
- if (ui_bound.type() != ui::SelectionBound::EMPTY)
- ui_bound.SetEdge(bound.edge_top, bound.edge_bottom);
- return ui_bound;
-}
-
} // anonymous namespace
ReadbackRequest::ReadbackRequest(float scale,
@@ -1348,7 +1323,7 @@ void RenderWidgetHostViewAndroid::OnFrameMetadataUpdated(
overscroll_controller_->OnFrameMetadataUpdated(frame_metadata);
if (selection_controller_) {
- selection_controller_->OnSelectionBoundsChanged(
+ selection_controller_->OnSelectionBoundsUpdated(
ConvertSelectionBound(frame_metadata.selection_start),
ConvertSelectionBound(frame_metadata.selection_end));
}
@@ -1668,7 +1643,7 @@ void RenderWidgetHostViewAndroid::OnShowingPastePopup(
selection_controller_->HideAndDisallowShowingAutomatically();
selection_controller_->OnSelectionEditable(true);
selection_controller_->OnSelectionEmpty(true);
- selection_controller_->OnSelectionBoundsChanged(insertion_bound,
+ selection_controller_->OnSelectionBoundsUpdated(insertion_bound,
insertion_bound);
selection_controller_->AllowShowingFromCurrentSelection();
}

Powered by Google App Engine
This is Rietveld 408576698