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

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

Issue 2057803002: Tracking SelectionBounds for all RenderWidgets on the Browser Side (Aura Only) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressing creis@'s comments Created 4 years, 5 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
« no previous file with comments | « content/browser/renderer_host/text_input_manager.h ('k') | content/public/test/text_input_test_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/text_input_manager.cc
diff --git a/content/browser/renderer_host/text_input_manager.cc b/content/browser/renderer_host/text_input_manager.cc
index 903c471b20aae51d1eaf8e09f3965bda4e597ace..3029d932d0a91d01e6d0ce3553047f800bd56054 100644
--- a/content/browser/renderer_host/text_input_manager.cc
+++ b/content/browser/renderer_host/text_input_manager.cc
@@ -6,6 +6,7 @@
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/common/view_messages.h"
namespace content {
@@ -54,6 +55,15 @@ RenderWidgetHostImpl* TextInputManager::GetActiveWidget() const {
: nullptr;
}
+gfx::Rect TextInputManager::GetSelectionBoundsRect() {
+ if (!active_view_)
+ return gfx::Rect();
+
+ return gfx::RectBetweenSelectionBounds(
+ selection_region_map_[active_view_].anchor,
+ selection_region_map_[active_view_].focus);
+}
+
void TextInputManager::UpdateTextInputState(
RenderWidgetHostViewBase* view,
const TextInputState& text_input_state) {
@@ -84,6 +94,60 @@ void TextInputManager::ImeCancelComposition(RenderWidgetHostViewBase* view) {
OnImeCancelComposition(this, view));
}
+void TextInputManager::SelectionBoundsChanged(
+ RenderWidgetHostViewBase* view,
+ const ViewHostMsg_SelectionBounds_Params& params) {
+ DCHECK(IsRegistered(view));
+
+// TODO(ekaramad): Implement the logic for other platforms (crbug.com/578168).
+#if defined(USE_AURA)
+ gfx::SelectionBound anchor_bound, focus_bound;
+ // Converting the points to the |view|'s root coordinate space (for child
+ // frame views).
+ anchor_bound.SetEdge(gfx::PointF(view->TransformPointToRootCoordSpace(
+ params.anchor_rect.origin())),
+ gfx::PointF(view->TransformPointToRootCoordSpace(
+ params.anchor_rect.bottom_left())));
+ focus_bound.SetEdge(gfx::PointF(view->TransformPointToRootCoordSpace(
+ params.focus_rect.origin())),
+ gfx::PointF(view->TransformPointToRootCoordSpace(
+ params.focus_rect.bottom_left())));
+
+ if (params.anchor_rect == params.focus_rect) {
+ anchor_bound.set_type(gfx::SelectionBound::CENTER);
+ focus_bound.set_type(gfx::SelectionBound::CENTER);
+ } else {
+ // Whether text is LTR at the anchor handle.
+ bool anchor_LTR = params.anchor_dir == blink::WebTextDirectionLeftToRight;
+ // Whether text is LTR at the focus handle.
+ bool focus_LTR = params.focus_dir == blink::WebTextDirectionLeftToRight;
+
+ if ((params.is_anchor_first && anchor_LTR) ||
+ (!params.is_anchor_first && !anchor_LTR)) {
+ anchor_bound.set_type(gfx::SelectionBound::LEFT);
+ } else {
+ anchor_bound.set_type(gfx::SelectionBound::RIGHT);
+ }
+ if ((params.is_anchor_first && focus_LTR) ||
+ (!params.is_anchor_first && !focus_LTR)) {
+ focus_bound.set_type(gfx::SelectionBound::RIGHT);
+ } else {
+ focus_bound.set_type(gfx::SelectionBound::LEFT);
+ }
+ }
+
+ if (anchor_bound == selection_region_map_[view].anchor &&
+ focus_bound == selection_region_map_[view].focus)
+ return;
+
+ selection_region_map_[view].anchor = anchor_bound;
+ selection_region_map_[view].focus = focus_bound;
+
+ FOR_EACH_OBSERVER(Observer, observer_list_,
+ OnSelectionBoundsChanged(this, view));
+#endif
+}
+
void TextInputManager::Register(RenderWidgetHostViewBase* view) {
DCHECK(!IsRegistered(view));
@@ -131,4 +195,9 @@ void TextInputManager::NotifyObserversAboutInputStateUpdate(
OnUpdateTextInputStateCalled(this, updated_view, did_update_state));
}
+TextInputManager::SelectionRegion::SelectionRegion() {}
+
+TextInputManager::SelectionRegion::SelectionRegion(
+ const SelectionRegion& other) = default;
+
} // namespace content
« no previous file with comments | « content/browser/renderer_host/text_input_manager.h ('k') | content/public/test/text_input_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698