Revert of Get rid of computeVisibleSelectionInDOMTreeDeprecated() in InputMethodController

third_party/WebKit/Source/core/editing/InputMethodController.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 245 matching lines @@
     ++deletion_end;
   }
   if (!forward_machine.AtCodePointBoundary())
     return kInvalidDeletionLength;
 
   const int offset = forward_machine.GetBoundaryOffset();
   DCHECK_EQ(offset, deletion_end - selection_end);
   return offset;
 }
 
-Element* RootEditableElementOfSelection(const FrameSelection& selection) {
-  return RootEditableElementOf(selection.GetSelectionInDOMTree().Base());
-}
-
 }  // anonymous namespace
 
 InputMethodController* InputMethodController::Create(LocalFrame& frame) {
   return new InputMethodController(frame);
 }
 
 InputMethodController::InputMethodController(LocalFrame& frame)
     : frame_(&frame), has_composition_(false) {}
 
 InputMethodController::~InputMethodController() = default;
@@ skipping 736 matching lines @@
 
 WebTextInputInfo InputMethodController::TextInputInfo() const {
   WebTextInputInfo info;
   if (!IsAvailable())
     return info;
 
   if (!GetFrame().Selection().IsAvailable()) {
     // plugins/mouse-capture-inside-shadow.html reaches here.
     return info;
   }
-  Element* element = RootEditableElementOfSelection(GetFrame().Selection());
+  Element* element = GetFrame()
+                         .Selection()
+                         .ComputeVisibleSelectionInDOMTreeDeprecated()
+                         .RootEditableElement();
   if (!element)
     return info;
 
   info.input_mode = InputModeOfFocusedElement();
   info.type = TextInputType();
   info.flags = TextInputFlags();
   if (info.type == kWebTextInputTypeNone)
     return info;
 
   if (!GetFrame().GetEditor().CanEdit())
@@ skipping 129 matching lines @@
 
 WebTextInputType InputMethodController::TextInputType() const {
   if (!GetFrame().Selection().IsAvailable()) {
     // "mouse-capture-inside-shadow.html" reaches here.
     return kWebTextInputTypeNone;
   }
 
   // It's important to preserve the equivalence of textInputInfo().type and
   // textInputType(), so perform the same rootEditableElement() existence check
   // here for consistency.
-  if (!RootEditableElementOfSelection(GetFrame().Selection()))
+  if (!GetFrame()
+           .Selection()
+           .ComputeVisibleSelectionInDOMTreeDeprecated()
+           .RootEditableElement())
     return kWebTextInputTypeNone;
 
   if (!IsAvailable())
     return kWebTextInputTypeNone;
 
   Element* element = GetDocument().FocusedElement();
   if (!element)
     return kWebTextInputTypeNone;
 
   if (isHTMLInputElement(*element)) {
@@ skipping 43 matching lines @@
   FinishComposingText(kKeepSelection);
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->Trace(frame_);
   visitor->Trace(composition_range_);
   SynchronousMutationObserver::Trace(visitor);
 }
 
 }  // namespace blink