Tracking SelectionBounds for all RenderWidgets on the Browser Side (Aura Only)

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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/render_widget_host_view_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1024 matching lines @@
   // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard.
   ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION);
   clipboard_writer.WriteText(text.substr(pos, n));
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 gfx::Size RenderWidgetHostViewAura::GetRequestedRendererSize() const {
   return delegated_frame_host_->GetRequestedRendererSize();
 }
 
-void RenderWidgetHostViewAura::SelectionBoundsChanged(
-    const ViewHostMsg_SelectionBounds_Params& params) {
-  gfx::SelectionBound anchor_bound, focus_bound;
-  anchor_bound.SetEdge(gfx::PointF(params.anchor_rect.origin()),
-                       gfx::PointF(params.anchor_rect.bottom_left()));
-  focus_bound.SetEdge(gfx::PointF(params.focus_rect.origin()),
-                      gfx::PointF(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_anchor_ && focus_bound == selection_focus_)
-    return;
-
-  selection_anchor_ = anchor_bound;
-  selection_focus_ = focus_bound;
-  if (GetInputMethod())
-    GetInputMethod()->OnCaretBoundsChanged(this);
-}
-
 void RenderWidgetHostViewAura::CopyFromCompositingSurface(
     const gfx::Rect& src_subrect,
     const gfx::Size& dst_size,
     const ReadbackRequestCallback& callback,
     const SkColorType preferred_color_type) {
   delegated_frame_host_->CopyFromCompositingSurface(
       src_subrect, dst_size, callback, preferred_color_type);
 }
 
 void RenderWidgetHostViewAura::CopyFromCompositingSurfaceToVideoFrame(
@@ skipping 463 matching lines @@
     return gfx::Rect(origin.x(),
                      origin.y(),
                      end.x() - origin.x(),
                      end.y() - origin.y());
   }
 
   return rect;
 }
 
 gfx::Rect RenderWidgetHostViewAura::GetCaretBounds() const {
-  return ConvertRectToScreen(
-      gfx::RectBetweenSelectionBounds(selection_anchor_, selection_focus_));
+  if (!text_input_manager_ || !text_input_manager_->GetActiveWidget())
+    return gfx::Rect();
+  return ConvertRectToScreen(text_input_manager_->GetSelectionBoundsRect());
 }
 
 bool RenderWidgetHostViewAura::GetCompositionCharacterBounds(
     uint32_t index,
     gfx::Rect* rect) const {
   DCHECK(rect);
   if (index >= composition_character_bounds_.size())
     return false;
   *rect = ConvertRectToScreen(composition_character_bounds_[index]);
   return true;
@@ skipping 1449 matching lines @@
     RenderWidgetHostViewBase* view) {
   // |view| is not necessarily the one corresponding to
   // TextInputManager::GetActiveWidget() as RenderWidgetHostViewAura can call
   // this method to finish any ongoing composition in response to a mouse down
   // event.
   if (GetInputMethod())
     GetInputMethod()->CancelComposition(this);
   has_composition_text_ = false;
 }
 
+void RenderWidgetHostViewAura::OnSelectionBoundsChanged(
+    TextInputManager* text_input_manager,
+    RenderWidgetHostViewBase* updated_view) {
+  if (GetInputMethod())
+    GetInputMethod()->OnCaretBoundsChanged(this);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content