Reduce canonicalization when dragging

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 1012 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 = frame()
-                         .selection()
-                         .computeVisibleSelectionInDOMTreeDeprecated()

[yosin_UTC9, 2017/03/16 02:30:05]

Let's do mechanical change for

computeVisibleSelectionInDOMDeprecaerd().rootEditableElement() to
rootEditableElement(...selectionInDOMTree().base())

in another patch.

[yoichio, 2017/03/16 04:10:59]

Acknowledged.

-                         .rootEditableElement();
+  Element* element =
+      rootEditableElementOf(frame().selection().selectionInDOMTree().base());
   if (!element)
     return info;
 
   info.inputMode = inputModeOfFocusedElement();
   info.type = textInputType();
   info.flags = textInputFlags();
   if (info.type == WebTextInputTypeNone)
     return info;
 
   if (!frame().editor().canEdit())
@@ skipping 125 matching lines @@
     return kWebTextInputModeUrl;
   return kWebTextInputModeDefault;
 }
 
 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 (!frame()
-           .selection()
-           .computeVisibleSelectionInDOMTreeDeprecated()
-           .rootEditableElement())
-    return WebTextInputTypeNone;
-
   if (!isAvailable())
     return WebTextInputTypeNone;
 
   Element* element = document().focusedElement();
   if (!element)
     return WebTextInputTypeNone;
 
+  // It's important to preserve the equivalence of textInputInfo().type and

[yosin_UTC9, 2017/03/16 02:30:05]

Please have another patch to moving this block.

[yoichio, 2017/03/16 04:10:59]

Acknowledged.

+  // textInputType(), so perform the same rootEditableElement() existence check
+  // here for consistency.
+  if (!rootEditableElementOf(frame().selection().selectionInDOMTree().base()))
+    return WebTextInputTypeNone;
+
   if (isHTMLInputElement(*element)) {
     HTMLInputElement& input = toHTMLInputElement(*element);
     const AtomicString& type = input.type();
 
     if (input.isDisabledOrReadOnly())
       return WebTextInputTypeNone;
 
     if (type == InputTypeNames::password)
       return WebTextInputTypePassword;
     if (type == InputTypeNames::search)
@@ skipping 34 matching lines @@
   finishComposingText(KeepSelection);
 }
 
 DEFINE_TRACE(InputMethodController) {
   visitor->trace(m_frame);
   visitor->trace(m_compositionRange);
   SynchronousMutationObserver::trace(visitor);
 }
 
 }  // namespace blink