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

third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.h

 /*
  * Copyright (C) 2005, 2006, 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 13 matching lines @@
  */
 
 #ifndef CompositeEditCommand_h
 #define CompositeEditCommand_h
 
 #include "core/CSSPropertyNames.h"
 #include "core/CoreExport.h"
 #include "core/editing/commands/EditCommand.h"
 #include "core/editing/commands/EditingState.h"
 #include "core/editing/commands/UndoStep.h"
+#include "core/events/InputEvent.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
 class EditingStyle;
 class Element;
 class HTMLBRElement;
 class HTMLElement;
 class HTMLSpanElement;
 class Text;
 
 enum class EditCommandSource { kMenuOrKeyBinding, kDOM };
 
 class EditCommandComposition final : public UndoStep {
  public:
   static EditCommandComposition* create(Document*,
                                         const VisibleSelection&,
-                                        const VisibleSelection&,
-                                        InputEvent::InputType);
+                                        const VisibleSelection&);
 
   bool belongsTo(const LocalFrame&) const override;
   void unapply(EditCommandSource) override;
   void reapply(EditCommandSource) override;
-  InputEvent::InputType inputType() const override;

[chongz, 2016/12/20 04:48:58]

We don't need |inputType()| for |EditCommandComposition| and |UndoStep| -- It
could only be undo or redo.

   void append(SimpleEditCommand*);
   void append(EditCommandComposition*);
 
   const VisibleSelection& startingSelection() const {
     return m_startingSelection;
   }
   const VisibleSelection& endingSelection() const { return m_endingSelection; }
   void setStartingSelection(const VisibleSelection&);
   void setEndingSelection(const VisibleSelection&);
   Element* startingRootEditableElement() const {
     return m_startingRootEditableElement.get();
   }
   Element* endingRootEditableElement() const {
     return m_endingRootEditableElement.get();
   }
 
   DECLARE_VIRTUAL_TRACE();
 
  private:
   EditCommandComposition(Document*,
                          const VisibleSelection& startingSelection,
-                         const VisibleSelection& endingSelection,
-                         InputEvent::InputType);
+                         const VisibleSelection& endingSelection);
 
-  // TODO(chongz): Implement "beforeinput" as described below:
   // Fires "beforeinput" and will returns |false| to cancel unapply / reapply if
   //   * "beforeinput" was canceled, or
   //   * |frame| was destroyed by event handlers.
   // Note: Undo stack will always get popped.
   bool willUnapply(EditCommandSource);
   bool willReapply(EditCommandSource);
 
   Member<Document> m_document;
   VisibleSelection m_startingSelection;
   VisibleSelection m_endingSelection;
   HeapVector<Member<SimpleEditCommand>> m_commands;
   Member<Element> m_startingRootEditableElement;
   Member<Element> m_endingRootEditableElement;
-  InputEvent::InputType m_inputType;
 };
 
 class CORE_EXPORT CompositeEditCommand : public EditCommand {
  public:
   enum ShouldPreserveSelection { PreserveSelection, DoNotPreserveSelection };
   enum ShouldPreserveStyle { PreserveStyle, DoNotPreserveStyle };
 
   ~CompositeEditCommand() override;
 
   // Returns |false| if the command failed.  e.g. It's aborted.
   bool apply(EditCommandSource);
   bool isFirstCommand(EditCommand* command) {
     return !m_commands.isEmpty() && m_commands.front() == command;
   }
   EditCommandComposition* composition() { return m_composition.get(); }
   EditCommandComposition* ensureComposition();
   // Append composition from an already applied command.
   void appendCommandToComposite(CompositeEditCommand*);
 
   virtual bool isReplaceSelectionCommand() const;
   virtual bool isTypingCommand() const;
   virtual bool isCommandGroupWrapper() const;
   virtual bool isDragAndDropCommand() const;
   virtual bool preservesTypingStyle() const;
   virtual void setShouldRetainAutocorrectionIndicator(bool);
   virtual bool shouldStopCaretBlinking() const { return false; }
 
+  virtual InputEvent::InputType inputType() const;
+  // |TypingCommand| will return the text of the last |m_commands|.
+  virtual String textDataForInputEvent() const;
+  virtual DataTransfer* dataTransferForInputEvent() const;
+  virtual RangeVector* targetRangesForInputEvent() const;
+
   DECLARE_VIRTUAL_TRACE();
 
  protected:
   explicit CompositeEditCommand(Document&);
 
-  // TODO(chongz): Implement "beforeinput" as described below:
   // Fires "beforeinput" and will return |false| to cancel applying editing if
   //   * "beforeinput" was canceled, or
   //   * |frame| was destroyed by event handlers.
   // |willApplyEditing()| should be called from
   //   * |CompositeEditCommand::apply()|, and
   //   * |TypingCommand::willAddTypingToOpenCommand()|.
   bool willApplyEditing(EditCommandSource);
 
   //
   // sugary-sweet convenience functions to help create and apply edit commands
@@ skipping 149 matching lines @@
 
 DEFINE_TYPE_CASTS(CompositeEditCommand,
                   EditCommand,
                   command,
                   command->isCompositeEditCommand(),
                   command.isCompositeEditCommand());
 
 }  // namespace blink
 
 #endif  // CompositeEditCommand_h