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

third_party/WebKit/Source/core/page/DragController.cpp

 /*
  * Copyright (C) 2007, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Google Inc.
  *
  * 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 447 matching lines @@
 }
 
 // Returns true if node at |point| is editable with populating |dragCaret| and
 // |range|, otherwise returns false.
 // TODO(yosin): We should return |VisibleSelection| rather than three values.
 static bool setSelectionToDragCaret(LocalFrame* frame,
                                     VisibleSelection& dragCaret,
                                     Range*& range,
                                     const IntPoint& point) {
   frame->selection().setSelection(dragCaret);
-  if (frame->selection().isNone()) {
+  if (frame->selection()
+          .computeVisibleSelectionInDOMTreeDeprecated()
+          .isNone()) {
     // TODO(editing-dev): The use of
     // updateStyleAndLayoutIgnorePendingStylesheets
     // needs to be audited.  See http://crbug.com/590369 for more details.
     // |LocalFrame::positinForPoint()| requires clean layout.
     frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
     const PositionWithAffinity& position = frame->positionForPoint(point);
     if (!position.isConnected())
       return false;
 
     frame->selection().setSelection(
         SelectionInDOMTree::Builder().collapse(position).build());
     dragCaret = frame->selection().computeVisibleSelectionInDOMTreeDeprecated();
     range = createRange(dragCaret.toNormalizedEphemeralRange());
   }
-  return !frame->selection().isNone() &&
+  return !frame->selection()
+              .computeVisibleSelectionInDOMTreeDeprecated()
+              .isNone() &&
          frame->selection()
              .computeVisibleSelectionInDOMTreeDeprecated()
              .isContentEditable();
 }
 
 DispatchEventResult DragController::dispatchTextInputEventFor(
     LocalFrame* innerFrame,
     DragData* dragData) {
   // Layout should be clean due to a hit test performed in |elementUnderMouse|.
   DCHECK(!innerFrame->document()->needsLayoutTreeUpdate());
@@ skipping 759 matching lines @@
 
 DEFINE_TRACE(DragController) {
   visitor->trace(m_page);
   visitor->trace(m_documentUnderMouse);
   visitor->trace(m_dragInitiator);
   visitor->trace(m_dragState);
   visitor->trace(m_fileInputElementUnderMouse);
 }
 
 }  // namespace blink