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

content/renderer/render_frame_impl.cc

 // Copyright 2013 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/render_frame_impl.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 1959 matching lines @@
   // This IPC is dispatched by RenderWidgetHost, so use its routing id.
   Send(new InputHostMsg_SelectRange_ACK(GetRenderWidget()->routing_id()));
 
   base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
   frame_->SelectRange(render_view_->ConvertWindowPointToViewport(base),
                       render_view_->ConvertWindowPointToViewport(extent));
 }
 
 void RenderFrameImpl::OnAdjustSelectionByCharacterOffset(int start_adjust,
                                                          int end_adjust) {
-  WebRange range = GetRenderWidget()->GetWebWidget()->CaretOrSelectionRange();
+  WebRange range = frame_->GetInputMethodController()->GetSelectionOffsets();
   if (range.IsNull())
     return;
 
   // Sanity checks to disallow empty and out of range selections.
   if (start_adjust - end_adjust > range.length() ||
       range.StartOffset() + start_adjust < 0)
     return;
 
   base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
 
   // A negative adjust amount moves the selection towards the beginning of
   // the document, a positive amount moves the selection towards the end of
   // the document.
   frame_->SelectRange(WebRange(range.StartOffset() + start_adjust,
                                range.length() + end_adjust - start_adjust),
                       WebLocalFrame::kPreserveHandleVisibility);
 }
 
 void RenderFrameImpl::OnCollapseSelection() {
   const WebRange& range =
-      GetRenderWidget()->GetWebWidget()->CaretOrSelectionRange();
+      frame_->GetInputMethodController()->GetSelectionOffsets();
   if (range.IsNull())
     return;
 
   base::AutoReset<bool> handling_select_range(&handling_select_range_, true);
   frame_->SelectRange(WebRange(range.EndOffset(), 0));
 }
 
 void RenderFrameImpl::OnMoveRangeSelectionExtent(const gfx::Point& point) {
   // This IPC is dispatched by RenderWidgetHost, so use its routing id.
   Send(new InputHostMsg_MoveRangeSelectionExtent_ACK(
@@ skipping 4203 matching lines @@
   gfx::Range range;
 #if BUILDFLAG(ENABLE_PLUGINS)
   if (focused_pepper_plugin_) {
     focused_pepper_plugin_->GetSurroundingText(&text, &range);
     offset = 0;  // Pepper API does not support offset reporting.
     // TODO(kinaba): cut as needed.
   } else
 #endif
   {
     WebRange selection =
-        GetRenderWidget()->GetWebWidget()->CaretOrSelectionRange();
+        frame_->GetInputMethodController()->GetSelectionOffsets();
     if (selection.IsNull())
       return;
 
     range = gfx::Range(selection.StartOffset(), selection.EndOffset());
 
     if (frame_->GetInputMethodController()->TextInputType() !=
         blink::kWebTextInputTypeNone) {
       // If current focused element is editable, we will send 100 more chars
       // before and after selection. It is for input method surrounding text
       // feature.
       if (selection.StartOffset() > kExtraCharsBeforeAndAfterSelection)
         offset = selection.StartOffset() - kExtraCharsBeforeAndAfterSelection;
       else
         offset = 0;
       size_t length =
           selection.EndOffset() - offset + kExtraCharsBeforeAndAfterSelection;
       text = frame_->RangeAsText(WebRange(offset, length)).Utf16();
     } else {
       offset = selection.StartOffset();
       text = frame_->SelectionAsText().Utf16();
       // http://crbug.com/101435
       // In some case, frame->selectionAsText() returned text's length is not
-      // equal to the length returned from
-      // GetWebWidget()->caretOrSelectionRange().
-      // So we have to set the range according to text.length().
+      // equal to the length returned from frame_->GetSelectionOffsets(). So we
+      // have to set the range according to text.length().
       range.set_end(range.start() + text.length());
     }
   }
 
   // TODO(dglazkov): Investigate if and why this would be happening,
   // and resolve this. We shouldn't be carrying selection text here.
   // http://crbug.com/632920.
   // Sometimes we get repeated didChangeSelection calls from webkit when
   // the selection hasn't actually changed. We don't want to report these
   // because it will cause us to continually claim the X clipboard.
@@ skipping 649 matching lines @@
       replaces_current_history_item(info.replaces_current_history_item),
       history_navigation_in_new_child_frame(
           info.is_history_navigation_in_new_child_frame),
       client_redirect(info.is_client_redirect),
       triggering_event_info(info.triggering_event_info),
       cache_disabled(info.is_cache_disabled),
       form(info.form),
       source_location(info.source_location) {}
 
 }  // namespace content