[InputEvent] Support |deleteByDrag|, |insertFromDrop| and fire in sequential order

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 24 matching lines @@
 #include "core/dom/Document.h"
 #include "core/dom/DocumentFragment.h"
 #include "core/dom/Element.h"
 #include "core/dom/Node.h"
 #include "core/dom/Text.h"
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/DragCaretController.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
+#include "core/editing/commands/DragAndDropCommand.h"
 #include "core/editing/serializers/Serialization.h"
 #include "core/events/TextEvent.h"
 #include "core/fetch/ImageResource.h"
 #include "core/fetch/ResourceFetcher.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/Settings.h"
 #include "core/html/HTMLAnchorElement.h"
 #include "core/html/HTMLFormElement.h"
@@ skipping 85 matching lines @@
 {
 }
 
 DragController* DragController::create(Page* page)
 {
     return new DragController(page);
 }
 
 static DocumentFragment* documentFragmentFromDragData(DragData* dragData, LocalFrame* frame, Range* context, bool allowPlainText, bool& chosePlainText)
 {
-    ASSERT(dragData);
+    DCHECK(dragData);
     chosePlainText = false;
 
     Document& document = context->ownerDocument();
     if (dragData->containsCompatibleContent()) {
         if (DocumentFragment* fragment = dragData->asFragment(frame))
             return fragment;
 
         if (dragData->containsURL(DragData::DoNotConvertFilenames)) {
             String title;
             String url = dragData->asURL(DragData::DoNotConvertFilenames, &title);
@@ skipping 336 matching lines @@
     }
     Range* range = createRange(dragCaret.toNormalizedEphemeralRange());
     Element* rootEditableElement = innerFrame->selection().rootEditableElement();
 
     // For range to be null a WebKit client must have done something bad while
     // manually controlling drag behaviour
     if (!range)
         return false;
     ResourceFetcher* fetcher = range->ownerDocument().fetcher();
     ResourceCacheValidationSuppressor validationSuppressor(fetcher);
+
+    // Start new Drag&Drop command group, invalidate previous command group.
+    // Assume no other places is firing |DeleteByDrag| and |InsertFromDrop|.
+    innerFrame->editor().registerCommandGroup(DragAndDropCommand::create(*innerFrame->document()));
+
     if (dragIsMove(innerFrame->selection(), dragData) || dragCaret.isContentRichlyEditable()) {
         bool chosePlainText = false;
         DocumentFragment* fragment = documentFragmentFromDragData(dragData, innerFrame, range, true, chosePlainText);
         if (!fragment)
             return false;
 
         if (dragIsMove(innerFrame->selection(), dragData)) {
             // NSTextView behavior is to always smart delete on moving a selection,
             // but only to smart insert if the selection granularity is word granularity.
-            bool smartDelete = innerFrame->editor().smartInsertDeleteEnabled();
-            bool smartInsert = smartDelete && innerFrame->selection().granularity() == WordGranularity && dragData->canSmartReplace();
-            innerFrame->editor().moveSelectionAfterDragging(fragment, dragCaret.base(), smartInsert, smartDelete);
+            const bool smartDelete = innerFrame->editor().smartInsertDeleteEnabled();
+            const bool smartInsert = smartDelete && innerFrame->selection().granularity() == WordGranularity && dragData->canSmartReplace();
+
+            if (!innerFrame->editor().deleteSelectionAfterDraggingWithEvents(innerFrame->editor().findEventTargetFromSelection(), smartDelete ? SmartDelete::Yes : SmartDelete::No, dragCaret.base()))
+                return false;
+
+            innerFrame->selection().setSelection(VisibleSelection(range->startPosition(), range->endPosition()));
+            if (innerFrame->selection().isAvailable()) {
+                DCHECK(m_documentUnderMouse);
+                if (!innerFrame->editor().replaceSelectionAfterDraggingWithEvents(element, dragData, fragment, range, smartInsert ? SmartInsert::Yes : SmartInsert::No, chosePlainText ? ChosePlainText::Yes : ChosePlainText::No))
+                    return false;
+            }
         } else {
             if (setSelectionToDragCaret(innerFrame, dragCaret, range, point)) {
-                ASSERT(m_documentUnderMouse);
-                m_documentUnderMouse->frame()->editor().replaceSelectionAfterDragging(fragment, dragData->canSmartReplace(), chosePlainText);
+                DCHECK(m_documentUnderMouse);
+                if (!innerFrame->editor().replaceSelectionAfterDraggingWithEvents(element, dragData, fragment, range, dragData->canSmartReplace() ? SmartInsert::Yes : SmartInsert::No, chosePlainText ? ChosePlainText::Yes : ChosePlainText::No))
+                    return false;
             }
         }
     } else {
         String text = dragData->asPlainText();
         if (text.isEmpty())
             return false;
 
         if (setSelectionToDragCaret(innerFrame, dragCaret, range, point)) {
-            const bool canSmartReplace = false;
-            const bool chosePlainText = true;
-            ASSERT(m_documentUnderMouse);
-            m_documentUnderMouse->frame()->editor().replaceSelectionAfterDragging(createFragmentFromText(EphemeralRange(range), text), canSmartReplace, chosePlainText);
+            const SmartInsert canSmartReplace = SmartInsert::No;

[yosin_UTC9, 2016/10/03 09:19:03]

nit: Since we have enum class for smart insert and plain text, we don't need to
have constant bool variable.

[chongz, 2016/10/04 02:18:39]

Done.

+            const ChosePlainText chosePlainText = ChosePlainText::Yes;
+            DCHECK(m_documentUnderMouse);
+            if (!innerFrame->editor().replaceSelectionAfterDraggingWithEvents(element, dragData, createFragmentFromText(EphemeralRange(range), text), range, canSmartReplace, chosePlainText))
+                return false;
         }
     }
 
     if (rootEditableElement) {
         if (LocalFrame* frame = rootEditableElement->document().frame())
             frame->eventHandler().updateDragStateAfterEditDragIfNeeded(rootEditableElement);
     }
 
     return true;
 }
@@ skipping 452 matching lines @@
 
 DEFINE_TRACE(DragController)
 {
     visitor->trace(m_page);
     visitor->trace(m_documentUnderMouse);
     visitor->trace(m_dragInitiator);
     visitor->trace(m_fileInputElementUnderMouse);
 }
 
 } // namespace blink