Tracking text selection on the browser side in OOPIF.

content/browser/renderer_host/render_widget_host_view_base.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_base.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/browser/accessibility/browser_accessibility_manager.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
@@ skipping 18 matching lines @@
 // How many microseconds apart input events should be flushed.
 const int kFlushInputRateInUs = 16666;
 
 }
 
 RenderWidgetHostViewBase::RenderWidgetHostViewBase()
     : popup_type_(blink::WebPopupTypeNone),
       background_color_(SK_ColorWHITE),
       mouse_locked_(false),
       showing_context_menu_(false),
+#if !defined(USE_AURA)
       selection_text_offset_(0),
       selection_range_(gfx::Range::InvalidRange()),
+#endif
       current_device_scale_factor_(0),
       current_display_rotation_(display::Display::ROTATE_0),
       pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
       text_input_manager_(nullptr),
       renderer_frame_number_(0),
-      weak_factory_(this) {}
+      weak_factory_(this) {
+}
 
 RenderWidgetHostViewBase::~RenderWidgetHostViewBase() {
   DCHECK(!mouse_locked_);
   // We call this here to guarantee that observers are notified before we go
   // away. However, some subclasses may wish to call this earlier in their
   // shutdown process, e.g. to force removal from
   // RenderWidgetHostInputEventRouter's surface map before relinquishing a
   // host pointer, as in RenderWidgetHostViewGuest. There is no harm in calling
   // NotifyObserversAboutShutdown() twice, as the observers are required to
   // de-register on the first call, and so the second call does nothing.
@@ skipping 47 matching lines @@
 
 void RenderWidgetHostViewBase::SelectionBoundsChanged(
     const ViewHostMsg_SelectionBounds_Params& params) {
   if (GetTextInputManager())
     GetTextInputManager()->SelectionBoundsChanged(this, params);
 }
 
 void RenderWidgetHostViewBase::SelectionChanged(const base::string16& text,
                                                 size_t offset,
                                                 const gfx::Range& range) {
+// TODO(ekaramad): Use TextInputManager code paths for IME on other platforms.
+// Also, remove the following local variables when that happens
+// (https://crbug.com/578168 and https://crbug.com/602427).
+#if defined(USE_AURA)
+  if (GetTextInputManager())
+    GetTextInputManager()->SelectionChanged(this, text, offset, range);
+#else
   selection_text_ = text;
   selection_text_offset_ = offset;
   selection_range_.set_start(range.start());
   selection_range_.set_end(range.end());
+#endif
 }
 
 gfx::Size RenderWidgetHostViewBase::GetRequestedRendererSize() const {
   return GetViewBounds().size();
 }
 
 ui::TextInputClient* RenderWidgetHostViewBase::GetTextInputClient() {
   NOTREACHED();
   return NULL;
 }
 
 bool RenderWidgetHostViewBase::IsShowingContextMenu() const {
   return showing_context_menu_;
 }
 
 void RenderWidgetHostViewBase::SetShowingContextMenu(bool showing) {
   DCHECK_NE(showing_context_menu_, showing);
   showing_context_menu_ = showing;
 }
 
 base::string16 RenderWidgetHostViewBase::GetSelectedText() {
+// TODO(ekaramad): Use TextInputManager code paths for IME onother platforms.

[Charlie Reis, 2016/07/20 23:00:30]

nit: on other

[EhsanK, 2016/07/21 16:52:55]

Done. Thanks!

+// Also, remove the following local variables when that happens
+// (https://crbug.com/578168 and https://crbug.com/602427).
+#if defined(USE_AURA)
+  if (!GetTextInputManager())
+    return base::string16();
+
+  const TextInputManager::TextSelection* selection =
+      GetTextInputManager()->GetTextSelection(this);
+
+  if (!selection || !selection->range.IsValid())
+    return base::string16();
+
+  return selection->text.substr(selection->range.GetMin() - selection->offset,
+                                selection->range.length());
+#else
   if (!selection_range_.IsValid())
     return base::string16();
   return selection_text_.substr(
       selection_range_.GetMin() - selection_text_offset_,
       selection_range_.length());
+#endif
 }
 
 bool RenderWidgetHostViewBase::IsMouseLocked() {
   return mouse_locked_;
 }
 
 InputEventAckState RenderWidgetHostViewBase::FilterInputEvent(
     const blink::WebInputEvent& input_event) {
   // By default, input events are simply forwarded to the renderer.
   return INPUT_EVENT_ACK_STATE_NOT_CONSUMED;
@@ skipping 312 matching lines @@
 
 bool RenderWidgetHostViewBase::IsChildFrameForTesting() const {
   return false;
 }
 
 cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
   return cc::SurfaceId();
 }
 
 }  // namespace content