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

content/browser/renderer_host/input/touch_selection_controller_client_child_frame.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/browser/renderer_host/input/touch_selection_controller_client_child_frame.h"
 
 #include "content/browser/frame_host/render_widget_host_view_child_frame.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/content_switches_internal.h"
@@ skipping 107 matching lines @@
 std::unique_ptr<ui::TouchHandleDrawable>
 TouchSelectionControllerClientChildFrame::CreateDrawable() {
   NOTREACHED();
   return std::unique_ptr<ui::TouchHandleDrawable>();
 }
 
 bool TouchSelectionControllerClientChildFrame::IsCommandIdEnabled(
     int command_id) const {
   bool editable = rwhv_->GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE;
   bool readable = rwhv_->GetTextInputType() != ui::TEXT_INPUT_TYPE_PASSWORD;
-  // TODO(wjmaclean): The test for has_selection should be changed to
-  //
-  //  rwhv_->GetSelectionRange(&selection_range);
-  //  bool has_selection = !selection_range.is_empty();
-  //
-  // like in TouchSelectionControllerClientAura. Unfortunately this fails here
-  // due to https://crbug.com/723790, which means that the first text
-  // selected in an oopif subframe when it acquires focus will fail to send
-  // a FrameHostMsg_SelectionChanged, meaning the TextInputManager won't
-  // know about the new selection.
-  bool has_selection = selection_start_.type() != gfx::SelectionBound::EMPTY &&
-                       selection_end_.type() != gfx::SelectionBound::EMPTY &&
-                       selection_start_ != selection_end_;
+
+  gfx::Range selection_range;
+  bool has_selection =
+      rwhv_->GetSelectionRange(&selection_range) && !selection_range.is_empty();
   switch (command_id) {
     case IDS_APP_CUT:
       return editable && readable && has_selection;
     case IDS_APP_COPY:
       return readable && has_selection;
     case IDS_APP_PASTE: {
       base::string16 result;
       ui::Clipboard::GetForCurrentThread()->ReadText(
           ui::CLIPBOARD_TYPE_COPY_PASTE, &result);
       return editable && !result.empty();
@@ skipping 42 matching lines @@
                                          gfx::ToRoundedPoint(anchor_point)));
 
   // Hide selection handles after getting rect-between-bounds from touch
   // selection controller; otherwise, rect would be empty and the above
   // calculations would be invalid.
   manager_->GetTouchSelectionController()
       ->HideAndDisallowShowingAutomatically();
 }
 
 }  // namespace content