[refactor] - Rename and Move WebWidget::CaretOrSelectionRange to WebInputMethodController::GetSelec…

content/renderer/input/frame_input_handler_impl.cc

 // Copyright 2017 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/renderer/input/frame_input_handler_impl.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/debug/stack_trace.h"
 #include "base/logging.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "content/renderer/render_widget.h"
+#include "third_party/WebKit/public/web/WebInputMethodController.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 namespace content {
 
 FrameInputHandlerImpl::FrameInputHandlerImpl(
     base::WeakPtr<RenderFrameImpl> render_frame,
     mojom::FrameInputHandlerRequest request)
     : binding_(this),
       render_frame_(render_frame),
       input_event_queue_(render_frame->GetRenderWidget()->GetInputEventQueue()),
@@ skipping 223 matching lines @@
 
 void FrameInputHandlerImpl::CollapseSelection() {
   if (!main_thread_task_runner_->BelongsToCurrentThread()) {
     RunOnMainThread(
         base::Bind(&FrameInputHandlerImpl::CollapseSelection, weak_this_));
     return;
   }
 
   if (!render_frame_)
     return;
-  const blink::WebRange& range =
-      render_frame_->GetRenderWidget()->GetWebWidget()->CaretOrSelectionRange();
+  const blink::WebRange& range = render_frame_->GetWebFrame()
+                                     ->GetInputMethodController()
+                                     ->GetSelectionOffsets();
   if (range.IsNull())
     return;
 
   HandlingState handling_state(render_frame_.get(),
                                UpdateState::kIsSelectingRange);
   render_frame_->GetWebFrame()->SelectRange(
       blink::WebRange(range.EndOffset(), 0));
 }
 
 void FrameInputHandlerImpl::SelectRange(const gfx::Point& base,
@@ skipping 21 matching lines @@
                                                              int32_t end) {
   if (!main_thread_task_runner_->BelongsToCurrentThread()) {
     RunOnMainThread(
         base::Bind(&FrameInputHandlerImpl::AdjustSelectionByCharacterOffset,
                    weak_this_, start, end));
     return;
   }
 
   if (!render_frame_)
     return;
-  blink::WebRange range =
-      render_frame_->GetRenderWidget()->GetWebWidget()->CaretOrSelectionRange();
+  blink::WebRange range = render_frame_->GetWebFrame()
+                              ->GetInputMethodController()
+                              ->GetSelectionOffsets();
   if (range.IsNull())
     return;
 
   // Sanity checks to disallow empty and out of range selections.
   if (start - end > range.length() || range.StartOffset() + start < 0)
     return;
 
   HandlingState handling_state(render_frame_.get(),
                                UpdateState::kIsSelectingRange);
   // A negative adjust amount moves the selection towards the beginning of
@@ skipping 99 matching lines @@
       break;
   }
 }
 
 FrameInputHandlerImpl::HandlingState::~HandlingState() {
   render_frame_->set_handling_select_range(original_select_range_value_);
   render_frame_->set_is_pasting(original_pasting_value_);
 }
 
 }  // namespace content