Expand FrameSeleciton::isNone() 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 811 matching lines @@
   if (!n)
     return false;
   LayoutObject* layoutObject = n->layoutObject();
   if (!layoutObject || !layoutObject->isLayoutPart())
     return false;
   Widget* widget = toLayoutPart(layoutObject)->widget();
   return widget && widget->isFrameView();
 }
 
 void FrameSelection::setFocusedNodeIfNeeded() {
-  if (isNone() || !isFocused())
+  if (computeVisibleSelectionInDOMTreeDeprecated().isNone() || !isFocused())
     return;
 
   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
@@ skipping 152 matching lines @@
                                                                 alignment))
       updateAppearance();
   }
 }
 
 void FrameSelection::setSelectionFromNone() {
   // Put a caret inside the body if the entire frame is editable (either the
   // entire WebView is editable or designMode is on for this document).
 
   Document* document = m_frame->document();
-  if (!isNone() || !(blink::hasEditableStyle(*document)))
+  if (!computeVisibleSelectionInDOMTreeDeprecated().isNone() ||
+      !(blink::hasEditableStyle(*document)))
     return;
 
   Element* documentElement = document->documentElement();
   if (!documentElement)
     return;
   if (HTMLBodyElement* body =
           Traversal<HTMLBodyElement>::firstChild(*documentElement)) {
     setSelection(SelectionInDOMTree::Builder()
                      .collapse(firstPositionInOrBeforeNode(body))
                      .build());
@@ skipping 80 matching lines @@
     return m_granularityStrategy.get();
 
   if (strategyType == SelectionStrategy::Direction)
     m_granularityStrategy = WTF::makeUnique<DirectionGranularityStrategy>();
   else
     m_granularityStrategy = WTF::makeUnique<CharacterGranularityStrategy>();
   return m_granularityStrategy.get();
 }
 
 void FrameSelection::moveRangeSelectionExtent(const IntPoint& contentsPoint) {
-  if (isNone())
+  if (computeVisibleSelectionInDOMTreeDeprecated().isNone())
     return;
 
   VisibleSelection newSelection =
       granularityStrategy()->updateExtent(contentsPoint, m_frame);
   setSelection(newSelection, HandleVisibility::Visible,
                FrameSelection::CloseTyping | FrameSelection::ClearTypingStyle |
                    FrameSelection::DoNotClearStrategy | UserTriggered,
                CursorAlignOnScroll::IfNeeded, CharacterGranularity);
 }
 
@@ skipping 58 matching lines @@
 }
 
 void showTree(const blink::FrameSelection* sel) {
   if (sel)
     sel->showTreeForThis();
   else
     LOG(INFO) << "Cannot showTree for <null> FrameSelection.";
 }
 
 #endif