Tracking SelectionBounds for all RenderWidgets on the Browser Side (Mac)

content/browser/renderer_host/text_input_manager.cc

 // Copyright 2016 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/text_input_manager.h"
 
 #include "base/strings/string16.h"
 #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"
@@ skipping 43 matching lines @@
 RenderWidgetHostImpl* TextInputManager::GetActiveWidget() const {
   return !!active_view_ ? static_cast<RenderWidgetHostImpl*>(
                               active_view_->GetRenderWidgetHost())
                         : nullptr;
 }
 
 const TextInputState* TextInputManager::GetTextInputState() const {
   return !!active_view_ ? &text_input_state_map_.at(active_view_) : nullptr;
 }
 
-gfx::Rect TextInputManager::GetSelectionBoundsRect() const {
-  if (!active_view_)
-    return gfx::Rect();
-
-  return gfx::RectBetweenSelectionBounds(
-      selection_region_map_.at(active_view_).anchor,
-      selection_region_map_.at(active_view_).focus);
-}
-
 const std::vector<gfx::Rect>* TextInputManager::GetCompositionCharacterBounds()
     const {
   return !!active_view_
              ? &composition_range_info_map_.at(active_view_).character_bounds
              : nullptr;
 }
 
 const TextInputManager::TextSelection* TextInputManager::GetTextSelection(
     RenderWidgetHostViewBase* view) const {
   DCHECK(!view || IsRegistered(view));
   if (!view)
     view = active_view_;
   return !!view ? &text_selection_map_.at(view) : nullptr;
 }
 
+#if defined(USE_AURA)
+gfx::Rect TextInputManager::GetSelectionBoundsRect() const {
+  if (!active_view_)
+    return gfx::Rect();
+
+  return gfx::RectBetweenSelectionBounds(
+      selection_region_map_.at(active_view_).anchor,
+      selection_region_map_.at(active_view_).focus);
+}
+
+#elif defined(OS_MACOSX)
+const gfx::Rect* TextInputManager::GetCaretRect(
+    RenderWidgetHostImpl* widget) const {
+  RenderWidgetHostViewBase* view = widget->GetView();
+  DCHECK(IsRegistered(view));
+  return &selection_region_map_.at(view).caret_rect;
+}
+
+const gfx::Rect* TextInputManager::GetFirstSelectionRect(
+    RenderWidgetHostImpl* widget) const {
+  RenderWidgetHostViewBase* view = widget->GetView();
+  DCHECK(IsRegistered(view));
+  return &selection_region_map_.at(view).first_selection_rect;
+}
+#endif
+
 void TextInputManager::UpdateTextInputState(
     RenderWidgetHostViewBase* view,
     const TextInputState& text_input_state) {
   DCHECK(IsRegistered(view));
 
   if (text_input_state.type == ui::TEXT_INPUT_TYPE_NONE &&
       active_view_ != view) {
     // We reached here because an IPC is received to reset the TextInputState
     // for |view|. But |view| != |active_view_|, which suggests that at least
     // one other view has become active and we have received the corresponding
@@ skipping 41 matching lines @@
 
 void TextInputManager::ImeCancelComposition(RenderWidgetHostViewBase* view) {
   DCHECK(IsRegistered(view));
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnImeCancelComposition(this, view));
 }
 
 void TextInputManager::SelectionBoundsChanged(
     RenderWidgetHostViewBase* view,
     const ViewHostMsg_SelectionBounds_Params& params) {
+#if !defined(OS_ANDROID)
   DCHECK(IsRegistered(view));
-
-// TODO(ekaramad): Implement the logic for other platforms (crbug.com/578168).
+  // Converting the anchor point to root's coordinate space (for child frame
+  // views).
+  gfx::Point anchor_origin_transformed =
+      view->TransformPointToRootCoordSpace(params.anchor_rect.origin());
 #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())),
+
+  anchor_bound.SetEdge(gfx::PointF(anchor_origin_transformed),
                        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);
@@ skipping 16 matching lines @@
       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;
-
+#else
+  if (params.anchor_rect == params.focus_rect) {
+    selection_region_map_[view].caret_rect.set_origin(
+        anchor_origin_transformed);
+    selection_region_map_[view].caret_rect.set_size(params.anchor_rect.size());
+  }
+  selection_region_map_[view].first_selection_rect.set_origin(
+      anchor_origin_transformed);
+  selection_region_map_[view].first_selection_rect.set_size(
+      params.anchor_rect.size());
+#endif  // USE_AURA
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnSelectionBoundsChanged(this, view));
-#endif
+#endif  // !OS_ANDROID
 }
 
 void TextInputManager::ImeCompositionRangeChanged(
     RenderWidgetHostViewBase* view,
     const gfx::Range& range,
     const std::vector<gfx::Rect>& character_bounds) {
   DCHECK(IsRegistered(view));
   composition_range_info_map_[view].character_bounds.clear();
 
   // The values for the bounds should be converted to root view's coordinates
@@ skipping 90 matching lines @@
 
 TextInputManager::TextSelection::TextSelection()
     : offset(0), range(gfx::Range::InvalidRange()), text(base::string16()) {}
 
 TextInputManager::TextSelection::TextSelection(const TextSelection& other) =
     default;
 
 TextInputManager::TextSelection::~TextSelection() {}
 
 }  // namespace content