[EditCommandSource] Pass source from |Editor::Command| to |Editor::apply*()/insert*()/...| (2/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 16 matching lines @@
 #define Editor_h
 
 #include "core/CoreExport.h"
 #include "core/clipboard/DataTransferAccessPolicy.h"
 #include "core/editing/EditingBehavior.h"
 #include "core/editing/EphemeralRange.h"
 #include "core/editing/FindOptions.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/VisibleSelection.h"
 #include "core/editing/WritingDirection.h"
+#include "core/editing/commands/CompositeEditCommand.h"
 #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;
@@ skipping 44 matching lines @@
   bool canCut() const;
   bool canCopy() const;
   bool canPaste() const;
   bool canDelete() const;
   bool canSmartCopyOrDelete() const;
 
   void cut(CommandSource);
   void copy();
   void paste(CommandSource);
   void pasteAsPlainText(CommandSource);
-  void performDelete();
+  void performDelete(CommandSource);
 
   static void countEvent(ExecutionContext*, const Event*);
   void copyImage(const HitTestResult&);
 
-  void transpose();
+  void transpose(CommandSource);
 
   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 removeFormattingAndStyle(CommandSource);
 
   void registerCommandGroup(CompositeEditCommand* commandGroupWrapper);
   void clearLastEditCommand();
 
-  bool deleteWithDirection(DeleteDirection,
+  bool deleteWithDirection(CommandSource,
+                           DeleteDirection,
                            TextGranularity,
                            bool killRing,
                            bool isTypingAction);
   void deleteSelectionWithSmartDelete(
+      CommandSource,
       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);
+  void applyStyle(CommandSource, StylePropertySet*, InputEvent::InputType);
+  void applyParagraphStyle(CommandSource,
+                           StylePropertySet*,
+                           InputEvent::InputType);
+  void applyStyleToSelection(CommandSource,
+                             StylePropertySet*,
+                             InputEvent::InputType);
+  void applyParagraphStyleToSelection(CommandSource,
+                                      StylePropertySet*,
+                                      InputEvent::InputType);
 
   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 35 matching lines @@
   Command createCommand(const String& commandName);
   // Command source is |CommandSource::Dom|.
   Command createCommandFromDOM(const String& commandName);
 
   // |Editor::executeCommand| is implementation of |WebFrame::executeCommand|
   // rather than |Document::execCommand|.
   bool executeCommand(const String&);
   bool executeCommand(const String& commandName, const String& value);
 
   bool insertText(const String&, KeyboardEvent* triggeringEvent);
-  bool insertTextWithoutSendingTextEvent(const String&,
+  bool insertTextWithoutSendingTextEvent(CommandSource,
+                                         const String&,
                                          bool selectInsertedText,
                                          TextEvent* triggeringEvent);
   bool insertLineBreak();
   bool insertParagraphSeparator();
 
   bool isOverwriteModeEnabled() const { return m_overwriteModeEnabled; }
   void toggleOverwriteModeEnabled();
 
   bool canUndo();
-  void undo();
+  void undo(CommandSource);
   bool canRedo();
-  void redo();
+  void redo(CommandSource);
 
   void setBaseWritingDirection(WritingDirection);
 
   // smartInsertDeleteEnabled and selectTrailingWhitespaceEnabled are
   // mutually exclusive, meaning that enabling one will disable the other.
   bool smartInsertDeleteEnabled() const;
   bool isSelectTrailingWhitespaceEnabled() const;
 
   bool preventRevealSelection() const { return m_preventRevealSelection; }
 
@@ skipping 23 matching lines @@
   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);
+  void computeAndSetTypingStyle(CommandSource,
+                                StylePropertySet*,
+                                InputEvent::InputType);
 
   // |firstRectForRange| requires up-to-date layout.
   IntRect firstRectForRange(const EphemeralRange&) const;
 
   void respondToChangedSelection(const Position& oldSelectionStart,
                                  FrameSelection::SetSelectionOptions);
 
   bool markedTextMatchesAreHighlighted() const;
   void setMarkedTextMatchesAreHighlighted(bool);
 
-  void replaceSelectionWithFragment(DocumentFragment*,
+  void replaceSelectionWithFragment(CommandSource,
+                                    DocumentFragment*,
                                     bool selectReplacement,
                                     bool smartReplace,
                                     bool matchStyle,
                                     InputEvent::InputType);
-  void replaceSelectionWithText(const String&,
-                                bool selectReplacement,
-                                bool smartReplace,
-                                InputEvent::InputType);
+  void replaceSelectionWithText(
+      const String&,
+      bool selectReplacement,
+      bool smartReplace,
+      InputEvent::InputType,
+      CommandSource = CommandSource::MenuOrKeyBinding);

[Xiaocheng, 2016/12/15 03:27:50]

I'm not a fan of this...

Since the troublemaker is WebLocalFrameImpl::replaceSelection, I think we should
move its implementation to Editor. The current implementation exposes too many
details of Editor to web/.

[Xiaocheng, 2016/12/15 05:38:21]

Implementation of WebLocalFrameImpl::replaceSelection is moved to Editor by
https://codereview.chromium.org/2575343002/. Please rebase accordingly.

[chongz, 2016/12/16 00:45:22]

Rebased and removed default parameter.

 
   // 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,
@@ skipping 89 matching lines @@
   m_mark = selection;
 }
 
 inline bool Editor::markedTextMatchesAreHighlighted() const {
   return m_areMarkedTextMatchesHighlighted;
 }
 
 }  // namespace blink
 
 #endif  // Editor_h