| Index: third_party/WebKit/Source/core/editing/Editor.h
|
| diff --git a/third_party/WebKit/Source/core/editing/Editor.h b/third_party/WebKit/Source/core/editing/Editor.h
|
| index a8fd72f5a1e5eac742bb3d073e33e769d72bac88..be846e4e33dbcaa700bed61fec68020616e9e522 100644
|
| --- a/third_party/WebKit/Source/core/editing/Editor.h
|
| +++ b/third_party/WebKit/Source/core/editing/Editor.h
|
| @@ -57,12 +57,12 @@ class TextEvent;
|
| class UndoStack;
|
| class UndoStep;
|
|
|
| -enum class EditCommandSource;
|
| enum class DeleteDirection;
|
| enum class DeleteMode { Simple, Smart };
|
| enum class InsertMode { Simple, Smart };
|
| enum class DragSourceType { HTMLSource, PlainTextSource };
|
|
|
| +enum EditorCommandSource { CommandFromMenuOrKeyBinding, CommandFromDOM };
|
| enum EditorParagraphSeparator {
|
| EditorParagraphSeparatorIsDiv,
|
| EditorParagraphSeparatorIsP
|
| @@ -94,10 +94,10 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
| bool canDelete() const;
|
| bool canSmartCopyOrDelete() const;
|
|
|
| - void cut(EditCommandSource);
|
| + void cut(EditorCommandSource);
|
| void copy();
|
| - void paste(EditCommandSource);
|
| - void pasteAsPlainText(EditCommandSource);
|
| + void paste(EditorCommandSource);
|
| + void pasteAsPlainText(EditorCommandSource);
|
| void performDelete();
|
|
|
| static void countEvent(ExecutionContext*, const Event*);
|
| @@ -142,7 +142,7 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
|
|
| public:
|
| Command();
|
| - Command(const EditorInternalCommand*, EditCommandSource, LocalFrame*);
|
| + Command(const EditorInternalCommand*, EditorCommandSource, LocalFrame*);
|
|
|
| bool execute(const String& parameter = String(),
|
| Event* triggeringEvent = nullptr) const;
|
| @@ -170,13 +170,13 @@ class CORE_EXPORT Editor final : public GarbageCollectedFinalized<Editor> {
|
| RangeVector* getTargetRanges() const;
|
|
|
| const EditorInternalCommand* m_command;
|
| - EditCommandSource m_source;
|
| + EditorCommandSource m_source;
|
| Member<LocalFrame> m_frame;
|
| };
|
| - // Command source is |EditCommandSource::kMenuOrKeyBinding|.
|
| - Command createCommand(const String& commandName);
|
| - // Command source is |EditCommandSource::kDOM|.
|
| - Command createCommandFromDOM(const String& commandName);
|
| + Command createCommand(
|
| + const String&
|
| + commandName); // Command source is CommandFromMenuOrKeyBinding.
|
| + Command createCommand(const String& commandName, EditorCommandSource);
|
|
|
| // |Editor::executeCommand| is implementation of |WebFrame::executeCommand|
|
| // rather than |Document::execCommand|.
|
|
|