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

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

 /*
  * Copyright (C) 2007, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2012 Google 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.
@@ skipping 186 matching lines @@
   if (isCollapsed())
     return "Caret";
   return "Range";
 }
 
 unsigned DOMSelection::rangeCount() const {
   if (!isAvailable())
     return 0;
   if (documentCachedRange())
     return 1;
-  if (frame()->selection().isNone())
+  if (frame()
+          ->selection()
+          .computeVisibleSelectionInDOMTreeDeprecated()
+          .isNone())
     return 0;
   // Any selection can be adjusted to Range for Document.
   if (isSelectionOfDocument())
     return 1;
   // In ShadowRoot, we need to try adjustment.
   return createRangeFromSelectionEditor() ? 1 : 0;
 }
 
 // https://www.w3.org/TR/selection-api/#dom-selection-collapse
 void DOMSelection::collapse(Node* node,
@@ skipping 238 matching lines @@
   // 3. Let oldAnchor and oldFocus be the context object's anchor and focus, and
   // let newFocus be the boundary point (node, offset).
   const Position& oldAnchor = anchorPosition();
   // TODO(tkent): Diagnostic checks for crbug.com/693578.  They should be
   // removed before M58 branch.
   if (oldAnchor.isNull()) {
     if (Range* range = documentCachedRange()) {
       LOG(FATAL)
           << "Selection has a cached Range, but anchorPosition is null. start="
           << range->startContainer() << " end=" << range->endContainer();
-    } else if (frame() && !frame()->selection().isNone()) {
+    } else if (frame() &&
+               !frame()
+                    ->selection()
+                    .computeVisibleSelectionInDOMTreeDeprecated()
+                    .isNone()) {
       LOG(FATAL) << "FrameSelection is not none, but anchorPosition is null.";
     }
   }
   DCHECK(!oldAnchor.isNull());
   const Position newFocus(node, offset);
 
   clearCachedRangeIfSelectionOfDocument();
 
   // 4. Let newRange be a new range.
   Range* newRange = Range::create(*frame()->document());
@@ skipping 165 matching lines @@
     return;
   }
 
   // The following code is necessary for
   // editing/selection/deleteFromDocument-crash.html, which assumes
   // deleteFromDocument() for text selection in a TEXTAREA deletes the TEXTAREA
   // value.
 
   FrameSelection& selection = frame()->selection();
 
-  if (selection.isNone())
+  if (selection.computeVisibleSelectionInDOMTreeDeprecated().isNone())
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // |VisibleSelection::toNormalizedEphemeralRange| requires clean layout.
   frame()->document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   Range* selectedRange =
       createRange(selection.computeVisibleSelectionInDOMTreeDeprecated()
                       .toNormalizedEphemeralRange());
@@ skipping 137 matching lines @@
     m_treeScope->document().addConsoleMessage(
         ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, message));
 }
 
 DEFINE_TRACE(DOMSelection) {
   visitor->trace(m_treeScope);
   ContextClient::trace(visitor);
 }
 
 }  // namespace blink