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 243 matching lines @@
     ++deletionEnd;
   }
   if (!forwardMachine.atCodePointBoundary())
     return invalidDeletionLength;
 
   const int offset = forwardMachine.getBoundaryOffset();
   DCHECK_EQ(offset, deletionEnd - selectionEnd);
   return offset;
 }
 
-Element* rootEditableElementOfSelection(const FrameSelection& selection) {
-  return rootEditableElementOf(selection.selectionInDOMTree().base());
-}
-
 }  // anonymous namespace
 
 InputMethodController* InputMethodController::create(LocalFrame& frame) {
   return new InputMethodController(frame);
 }
 
 InputMethodController::InputMethodController(LocalFrame& frame)
     : m_frame(&frame), m_hasComposition(false) {}
 
 InputMethodController::~InputMethodController() = default;
@@ skipping 749 matching lines @@
 
 WebTextInputInfo InputMethodController::textInputInfo() const {
   WebTextInputInfo info;
   if (!isAvailable())
     return info;
 
   if (!frame().selection().isAvailable()) {
     // plugins/mouse-capture-inside-shadow.html reaches here.
     return info;
   }
-  Element* element = rootEditableElementOfSelection(frame().selection());
+  Element* element = frame()
+                         .selection()
+                         .computeVisibleSelectionInDOMTreeDeprecated()
+                         .rootEditableElement();
   if (!element)
     return info;
 
   info.inputMode = inputModeOfFocusedElement();
   info.type = textInputType();
   info.flags = textInputFlags();
   if (info.type == WebTextInputTypeNone)
     return info;
 
   if (!frame().editor().canEdit())
@@ skipping 128 matching lines @@
 
 WebTextInputType InputMethodController::textInputType() const {
   if (!frame().selection().isAvailable()) {
     // "mouse-capture-inside-shadow.html" reaches here.
     return WebTextInputTypeNone;
   }
 
   // It's important to preserve the equivalence of textInputInfo().type and
   // textInputType(), so perform the same rootEditableElement() existence check
   // here for consistency.
-  if (!rootEditableElementOfSelection(frame().selection()))
+  if (!frame()
+           .selection()
+           .computeVisibleSelectionInDOMTreeDeprecated()
+           .rootEditableElement())
     return WebTextInputTypeNone;
 
   if (!isAvailable())
     return WebTextInputTypeNone;
 
   Element* element = document().focusedElement();
   if (!element)
     return WebTextInputTypeNone;
 
   if (isHTMLInputElement(*element)) {
@@ skipping 43 matching lines @@
   finishComposingText(KeepSelection);
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink