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

third_party/WebKit/Source/core/editing/Editor.h

 /*
  * Copyright (C) 2006, 2007, 2008 Apple 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 26 matching lines @@
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/markers/DocumentMarker.h"
 #include "core/events/InputEvent.h"
 #include "platform/PasteMode.h"
 #include "platform/heap/Handle.h"
 #include <memory>
 
 namespace blink {
 
 class CompositeEditCommand;
+class DragData;
 class DummyPageHolder;
 class EditCommandComposition;
 class EditorClient;
 class EditorInternalCommand;
 class LocalFrame;
 class HitTestResult;
 class KillRing;
 class Pasteboard;
 class SpellChecker;
 class StylePropertySet;
 class TextEvent;
 class UndoStack;
 
 enum class DeleteDirection;
+enum class SmartDelete { Yes, No };

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

How about enum class DeleteMode { Simple, Smart }?

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

Done.

+enum class SmartInsert { Yes, No };

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

How about enum class InsertMode { Simple, Smart }?

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

Done.

+enum class ChosePlainText { Yes, No };

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

How about DragSourceType { HTMLSource, PlainTextSource }?

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

Done.

 
 enum EditorCommandSource { CommandFromMenuOrKeyBinding, CommandFromDOM };
 enum EditorParagraphSeparator { EditorParagraphSeparatorIsDiv, EditorParagraphSeparatorIsP };
 
 class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
     WTF_MAKE_NONCOPYABLE(Editor);
 public:
     static Editor* create(LocalFrame&);
     ~Editor();
 
@@ skipping 28 matching lines @@
     void transpose();
 
     void respondToChangedContents(const VisibleSelection& endingSelection);
 
     bool selectionStartHasStyle(CSSPropertyID, const String& value) const;
     TriState selectionHasStyle(CSSPropertyID, const String& value) const;
     String selectionStartCSSPropertyValue(CSSPropertyID);
 
     void removeFormattingAndStyle();
 
+    void registerCommandGroup(CompositeEditCommand* commandGroupWrapper);
     void clearLastEditCommand();
 
     bool deleteWithDirection(DeleteDirection, TextGranularity, bool killRing, bool isTypingAction);
-    void deleteSelectionWithSmartDelete(bool smartDelete, InputEvent::InputType);
+    void deleteSelectionWithSmartDelete(bool smartDelete, InputEvent::InputType, const Position& referenceMovePosition = Position());

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

Is it better to use |SmartDelete| enum class instead of bool?

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

Done.

 
     void applyStyle(StylePropertySet*, InputEvent::InputType);
     void applyParagraphStyle(StylePropertySet*, InputEvent::InputType);
     void applyStyleToSelection(StylePropertySet*, InputEvent::InputType);
     void applyParagraphStyleToSelection(StylePropertySet*, InputEvent::InputType);
 
     void appliedEditing(CompositeEditCommand*);
     void unappliedEditing(EditCommandComposition*);
     void reappliedEditing(EditCommandComposition*);
 
@@ skipping 75 matching lines @@
     EditingBehavior behavior() const;
 
     EphemeralRange selectedRange();
 
     void addToKillRing(const EphemeralRange&);
 
     void pasteAsFragment(DocumentFragment*, bool smartReplace, bool matchStyle);
     void pasteAsPlainText(const String&, bool smartReplace);
 
     Element* findEventTargetFrom(const VisibleSelection&) const;
+    Element* findEventTargetFromSelection() const;
 
     bool findString(const String&, FindOptions);
 
     Range* findStringAndScrollToVisible(const String&, Range*, FindOptions);
     Range* findRangeOfString(const String& target, const EphemeralRange& referenceRange, FindOptions);
     Range* findRangeOfString(const String& target, const EphemeralRangeInFlatTree& referenceRange, FindOptions);
 
     const VisibleSelection& mark() const; // Mark, to be used as emacs uses it.
     void setMark(const VisibleSelection&);
 
     void computeAndSetTypingStyle(StylePropertySet*, InputEvent::InputType);
 
     // |firstRectForRange| requires up-to-date layout.
     IntRect firstRectForRange(const EphemeralRange&) const;
 
     void respondToChangedSelection(const VisibleSelection& oldSelection, FrameSelection::SetSelectionOptions);
 
     bool markedTextMatchesAreHighlighted() const;
     void setMarkedTextMatchesAreHighlighted(bool);
 
     void replaceSelectionWithFragment(DocumentFragment*, bool selectReplacement, bool smartReplace, bool matchStyle);
     void replaceSelectionWithText(const String&, bool selectReplacement, bool smartReplace);
 
     // TODO(xiaochengh): Replace |bool| parameters by |enum|.
     void replaceSelectionAfterDragging(DocumentFragment*, bool smartReplace, bool plainText);
-    void moveSelectionAfterDragging(DocumentFragment*, const Position&, bool smartInsert, bool smartDelete);
+
+    // Return false if frame was destroyed by event handler, should stop executing remaining actions.
+    bool deleteSelectionAfterDraggingWithEvents(Element* dragSource, SmartDelete, const Position& referenceMovePosition);
+    bool replaceSelectionAfterDraggingWithEvents(Element* dropTarget, DragData*, DocumentFragment*, Range* dropCaretRange, SmartInsert, ChosePlainText);
 
     EditorParagraphSeparator defaultParagraphSeparator() const { return m_defaultParagraphSeparator; }
     void setDefaultParagraphSeparator(EditorParagraphSeparator separator) { m_defaultParagraphSeparator = separator; }
 
     static void tidyUpHTMLStructure(Document&);
 
     class RevealSelectionScope {
         WTF_MAKE_NONCOPYABLE(RevealSelectionScope);
         DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     public:
@@ skipping 38 matching lines @@
     bool canSmartReplaceWithPasteboard(Pasteboard*);
     void pasteAsPlainTextWithPasteboard(Pasteboard*);
     void pasteWithPasteboard(Pasteboard*);
     void writeSelectionToPasteboard();
     bool dispatchCPPEvent(const AtomicString&, DataTransferAccessPolicy, PasteMode = AllMimeTypes);
 
     void revealSelectionAfterEditingOperation(const ScrollAlignment& = ScrollAlignment::alignCenterIfNeeded, RevealExtentOption = DoNotRevealExtent);
     void changeSelectionAfterCommand(const VisibleSelection& newSelection, FrameSelection::SetSelectionOptions);
     void notifyComponentsOnChangedSelection();
 
-    Element* findEventTargetFromSelection() const;
-
     SpellChecker& spellChecker() const;
 
     bool handleEditingKeyboardEvent(KeyboardEvent*);
 };
 
 inline void Editor::setStartNewKillRingSequence(bool flag)
 {
     m_shouldStartNewKillRingSequence = flag;
 }
 
 inline const VisibleSelection& Editor::mark() const
 {
     return m_mark;
 }
 
 inline void Editor::setMark(const VisibleSelection& selection)
 {
     m_mark = selection;
 }
 
 inline bool Editor::markedTextMatchesAreHighlighted() const
 {
     return m_areMarkedTextMatchesHighlighted;
 }
 
 
 } // namespace blink
 
 #endif // Editor_h