[InputEvent] Move 'beforeinput' logic into |CompositeEditCommand::willApplyEditing()| (3/3)

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 EditCommandComposition;
 class EditorClient;
 class EditorInternalCommand;
 class LocalFrame;
 class HitTestResult;
 class KillRing;
 class Pasteboard;
 class SpellChecker;
 class StylePropertySet;
 class TextEvent;
@@ skipping 65 matching lines @@
   void deleteSelectionWithSmartDelete(
       DeleteMode,
       InputEvent::InputType,
       const Position& referenceMovePosition = Position());
 
   void applyStyle(StylePropertySet*, InputEvent::InputType);
   void applyParagraphStyle(StylePropertySet*, InputEvent::InputType);
   void applyStyleToSelection(StylePropertySet*, InputEvent::InputType);
   void applyParagraphStyleToSelection(StylePropertySet*, InputEvent::InputType);
 
+  bool willApplyEditing(CompositeEditCommand*);
   void appliedEditing(CompositeEditCommand*);
   void unappliedEditing(EditCommandComposition*);
   void reappliedEditing(EditCommandComposition*);
 
   void setShouldStyleWithCSS(bool flag) { m_shouldStyleWithCSS = flag; }
   bool shouldStyleWithCSS() const { return m_shouldStyleWithCSS; }
 
   class CORE_EXPORT Command {
     STACK_ALLOCATED();
 
@@ skipping 15 matching lines @@
 
     // Returns 0 if this Command is not supported.
     int idForHistogram() const;
 
    private:
     LocalFrame& frame() const {
       DCHECK(m_frame);
       return *m_frame;
     }
 
-    // Returns target ranges for the command, currently only supports delete
-    // related commands. Used by InputEvent.
-    RangeVector* getTargetRanges() const;
-
     const EditorInternalCommand* m_command;
     EditorCommandSource m_source;
     Member<LocalFrame> m_frame;
   };
   Command createCommand(
       const String&
           commandName);  // Command source is CommandFromMenuOrKeyBinding.
   Command createCommand(const String& commandName, EditorCommandSource);
 
   // |Editor::executeCommand| is implementation of |WebFrame::executeCommand|
@@ skipping 77 matching lines @@
   void replaceSelectionWithText(const String&,
                                 bool selectReplacement,
                                 bool smartReplace,
                                 InputEvent::InputType);
 
   // TODO(xiaochengh): Replace |bool| parameters by |enum|.
   void replaceSelectionAfterDragging(DocumentFragment*,
                                      InsertMode,
                                      DragSourceType);
 
-  // Return false if frame was destroyed by event handler, should stop executing
-  // remaining actions.
-  bool deleteSelectionAfterDraggingWithEvents(
-      Element* dragSource,
-      DeleteMode,
-      const Position& referenceMovePosition);
-  bool replaceSelectionAfterDraggingWithEvents(Element* dropTarget,
-                                               DragData*,
-                                               DocumentFragment*,
-                                               Range* dropCaretRange,
-                                               InsertMode,
-                                               DragSourceType);
-
   EditorParagraphSeparator defaultParagraphSeparator() const {
     return m_defaultParagraphSeparator;
   }
   void setDefaultParagraphSeparator(EditorParagraphSeparator separator) {
     m_defaultParagraphSeparator = separator;
   }
 
   static void tidyUpHTMLStructure(Document&);
 
   class RevealSelectionScope {
@@ skipping 18 matching lines @@
   Member<CompositeEditCommand> m_lastEditCommand;
   const Member<UndoStack> m_undoStack;
   int m_preventRevealSelection;
   bool m_shouldStartNewKillRingSequence;
   bool m_shouldStyleWithCSS;
   const std::unique_ptr<KillRing> m_killRing;
   VisibleSelection m_mark;
   bool m_areMarkedTextMatchesHighlighted;
   EditorParagraphSeparator m_defaultParagraphSeparator;
   bool m_overwriteModeEnabled;
+  bool m_executingCommandFromDOM;
 
   explicit Editor(LocalFrame&);
 
   LocalFrame& frame() const {
     DCHECK(m_frame);
     return *m_frame;
   }
 
   bool canDeleteRange(const EphemeralRange&) const;
 
@@ skipping 32 matching lines @@
   m_mark = selection;
 }
 
 inline bool Editor::markedTextMatchesAreHighlighted() const {
   return m_areMarkedTextMatchesHighlighted;
 }
 
 }  // namespace blink
 
 #endif  // Editor_h