Expand FrameSeleciton::isContentEditable() 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 181 matching lines @@
     dragSourceType = DragSourceType::PlainTextSource;
     return createFragmentFromText(EphemeralRange(context),
                                   dragData->asPlainText());
   }
 
   return nullptr;
 }
 
 bool DragController::dragIsMove(FrameSelection& selection, DragData* dragData) {
   return m_documentUnderMouse == m_dragInitiator &&
-         selection.isContentEditable() &&
+         selection.computeVisibleSelectionInDOMTreeDeprecated()
+             .isContentEditable() &&
          selection.computeVisibleSelectionInDOMTreeDeprecated().isRange() &&
          !isCopyKeyDown(dragData);
 }
 
 // FIXME: This method is poorly named.  We're just clearing the selection from
 // the document this drag is exiting.
 void DragController::cancelDrag() {
   m_page->dragCaret().clear();
 }
 
@@ skipping 259 matching lines @@
     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() && frame->selection().isContentEditable();
+  return !frame->selection().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());
   DCHECK(m_page->dragCaret().hasCaret());
   String text = m_page->dragCaret().isContentRichlyEditable()
                     ? ""
@@ skipping 646 matching lines @@
                                     imageSizeInPixels, dragLocation);
     }
     doSystemDrag(dragImage.get(), dragLocation, dragOrigin, dataTransfer, src,
                  false);
   } else if (state.m_dragType == DragSourceActionLink) {
     if (linkURL.isEmpty())
       return false;
     if (src->selection()
             .computeVisibleSelectionInDOMTreeDeprecated()
             .isCaret() &&
-        src->selection().isContentEditable()) {
+        src->selection()
+            .computeVisibleSelectionInDOMTreeDeprecated()
+            .isContentEditable()) {
       // a user can initiate a drag on a link without having any text
       // selected.  In this case, we should expand the selection to
       // the enclosing anchor element
       if (Node* node = enclosingAnchorElement(src->selection().base())) {
         src->selection().setSelection(
             SelectionInDOMTree::Builder().selectAllChildren(*node).build());
       }
     }
 
     if (!dragImage) {
@@ skipping 84 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