Prune createVisibleSelectionDeprecated from DragController

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 442 matching lines @@
     return DragOperationNone;
   return dragOperation(dragData);
 }
 
 static bool setSelectionToDragCaret(LocalFrame* frame,
                                     VisibleSelection& dragCaret,
                                     Range*& range,
                                     const IntPoint& point) {
   frame->selection().setSelection(dragCaret);
   if (frame->selection().isNone()) {
-    dragCaret =
-        createVisibleSelectionDeprecated(frame->positionForPoint(point));
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    frame->document()->updateStyleAndLayoutIgnorePendingStylesheets();
+
+    dragCaret = createVisibleSelection(frame->positionForPoint(point));
     frame->selection().setSelection(dragCaret);
     range = createRange(dragCaret.toNormalizedEphemeralRange());
   }
   return !frame->selection().isNone() && frame->selection().isContentEditable();
 }
 
 DispatchEventResult DragController::dispatchTextInputEventFor(
     LocalFrame* innerFrame,
     DragData* dragData) {
+  // Layout should be clean due to a hit test performed in |elementUnderMouse|.
+  DCHECK(!innerFrame->document()->needsLayoutTreeUpdate());
   ASSERT(m_page->dragCaretController().hasCaret());
   String text = m_page->dragCaretController().isContentRichlyEditable()
                     ? ""
                     : dragData->asPlainText();
-  Element* target =
-      innerFrame->editor().findEventTargetFrom(createVisibleSelectionDeprecated(
-          m_page->dragCaretController().caretPosition()));
+  Element* target = innerFrame->editor().findEventTargetFrom(
+      createVisibleSelection(m_page->dragCaretController().caretPosition()));
   return target->dispatchEvent(
       TextEvent::createForDrop(innerFrame->domWindow(), text));
 }
 
 bool DragController::concludeEditDrag(DragData* dragData) {
   ASSERT(dragData);
 
   HTMLInputElement* fileInput = m_fileInputElementUnderMouse;
   if (m_fileInputElementUnderMouse) {
     m_fileInputElementUnderMouse->setCanReceiveDroppedFiles(false);
@@ skipping 24 matching lines @@
       return false;
 
     return fileInput->receiveDroppedFiles(dragData);
   }
 
   if (!m_page->dragController().canProcessDrag(dragData)) {
     m_page->dragCaretController().clear();
     return false;
   }
 
-  VisibleSelection dragCaret = createVisibleSelectionDeprecated(
-      m_page->dragCaretController().caretPosition());
+  if (m_page->dragCaretController().hasCaret()) {
+    // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
+    // needs to be audited.  See http://crbug.com/590369 for more details.
+    m_page->dragCaretController()
+        .caretPosition()
+        .position()
+        .document()
+        ->updateStyleAndLayoutIgnorePendingStylesheets();
+  }
+
+  VisibleSelection dragCaret =
+      createVisibleSelection(m_page->dragCaretController().caretPosition());
   m_page->dragCaretController().clear();
   // |innerFrame| can be removed by event handler called by
   // |dispatchTextInputEventFor()|.
   if (!innerFrame->selection().isAvailable()) {
     // "editing/pasteboard/drop-text-events-sideeffect-crash.html" reaches
     // here.
     return false;
   }
   Range* range = createRange(dragCaret.toNormalizedEphemeralRange());
   Element* rootEditableElement = innerFrame->selection().rootEditableElement();
@@ skipping 243 matching lines @@
                                             DataTransfer* dataTransfer,
                                             Element* node,
                                             const KURL& linkURL,
                                             const KURL& imageURL,
                                             const String& label) {
   node->document().updateStyleAndLayoutTree();
   if (hasRichlyEditableStyle(*node)) {
     Range* range = source->document()->createRange();
     range->selectNode(node, ASSERT_NO_EXCEPTION);
     source->selection().setSelection(
-        createVisibleSelectionDeprecated(EphemeralRange(range)));
+        createVisibleSelection(EphemeralRange(range)));
   }
   dataTransfer->declareAndWriteDragImage(
       node, !linkURL.isEmpty() ? linkURL : imageURL, label);
 }
 
 bool DragController::populateDragDataTransfer(LocalFrame* src,
                                               const DragState& state,
                                               const IntPoint& dragOrigin) {
   ASSERT(dragTypeIsValid(state.m_dragType));
   ASSERT(src);
@@ skipping 316 matching lines @@
 }
 
 DEFINE_TRACE(DragController) {
   visitor->trace(m_page);
   visitor->trace(m_documentUnderMouse);
   visitor->trace(m_dragInitiator);
   visitor->trace(m_fileInputElementUnderMouse);
 }
 
 }  // namespace blink