Expand FrameSeleciton::rootEditableElement() to increase chances of hoisting update layout

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

 /*
  * Copyright (C) 2004, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * 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
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 148 matching lines @@
   return computeVisibleSelectionInDOMTree();
 }
 
 const VisibleSelectionInFlatTree& FrameSelection::selectionInFlatTree() const {
   return computeVisibleSelectionInFlatTree();
 }
 
 void FrameSelection::moveCaretSelection(const IntPoint& point) {
   DCHECK(!document().needsLayoutTreeUpdate());
 
-  Element* const editable = rootEditableElement();
+  Element* const editable =
+      computeVisibleSelectionInDOMTree().rootEditableElement();
   if (!editable)
     return;
 
   const VisiblePosition position =
       visiblePositionForContentsPoint(point, frame());
   SelectionInDOMTree::Builder builder;
   builder.setIsDirectional(
       computeVisibleSelectionInDOMTreeDeprecated().isDirectional());
   builder.setIsHandleVisible(true);
   if (position.isNotNull())
@@ skipping 648 matching lines @@
   if (!layoutObject || !layoutObject->isLayoutPart())
     return false;
   Widget* widget = toLayoutPart(layoutObject)->widget();
   return widget && widget->isFrameView();
 }
 
 void FrameSelection::setFocusedNodeIfNeeded() {
   if (isNone() || !isFocused())
     return;
 
-  if (Element* target = rootEditableElement()) {
+  if (Element* target =
+          computeVisibleSelectionInDOMTreeDeprecated().rootEditableElement()) {
     // Walk up the DOM tree to search for a node to focus.
     document().updateStyleAndLayoutTreeIgnorePendingStylesheets();
     while (target) {
       // We don't want to set focus on a subframe when selecting in a parent
       // frame, so add the !isFrameElement check here. There's probably a better
       // way to make this work in the long term, but this is the safest fix at
       // this time.
       if (target->isMouseFocusable() && !isFrameElement(target)) {
         m_frame->page()->focusController().setFocusedElement(target, m_frame);
         return;
@@ skipping 328 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif