Revert of [EditCommandSource] Rename and move |EditorCommandSource| to "CompositeEditCommand.h (1/3)

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
  *
  * 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
@@ skipping 1034 matching lines @@
   EditingState editingState;
   if (!TypingCommand::insertParagraphSeparator(*frame().document()))
     return false;
   revealSelectionAfterEditingOperation(
       alignToEdge ? ScrollAlignment::alignToEdgeIfNeeded
                   : ScrollAlignment::alignCenterIfNeeded);
 
   return true;
 }
 
-void Editor::cut(EditCommandSource source) {
+void Editor::cut(EditorCommandSource source) {
   if (tryDHTMLCut())
     return;  // DHTML did the whole operation
   if (!canCut())
     return;
 
   // TODO(xiaochengh): The use of updateStyleAndLayoutIgnorePendingStylesheets
   // needs to be audited.  See http://crbug.com/590369 for more details.
   // |tryDHTMLCut| dispatches cut event, which may make layout dirty, but we
   // need clean layout to obtain the selected content.
   frame().document()->updateStyleAndLayoutIgnorePendingStylesheets();
 
   // TODO(yosin) We should use early return style here.
   if (canDeleteRange(selectedRange())) {
     spellChecker().updateMarkersForWordsAffectedByEditing(true);
     if (enclosingTextControl(frame().selection().start())) {
       String plainText = frame().selectedTextForClipboard();
       Pasteboard::generalPasteboard()->writePlainText(
           plainText, canSmartCopyOrDelete() ? Pasteboard::CanSmartReplace
                                             : Pasteboard::CannotSmartReplace);
     } else {
       writeSelectionToPasteboard();
     }
 
-    if (source == EditCommandSource::kMenuOrKeyBinding) {
+    if (source == CommandFromMenuOrKeyBinding) {
       if (dispatchBeforeInputDataTransfer(findEventTargetFromSelection(),
                                           InputEvent::InputType::DeleteByCut,
                                           nullptr, nullptr) !=
           DispatchEventResult::NotCanceled)
         return;
       // 'beforeinput' event handler may destroy target frame.
       if (m_frame->document()->frame() != m_frame)
         return;
     }
     deleteSelectionWithSmartDelete(
@@ skipping 23 matching lines @@
     Document* document = frame().document();
     if (HTMLImageElement* imageElement =
             imageElementFromImageDocument(document))
       writeImageNodeToPasteboard(Pasteboard::generalPasteboard(), imageElement,
                                  document->title());
     else
       writeSelectionToPasteboard();
   }
 }
 
-void Editor::paste(EditCommandSource source) {
+void Editor::paste(EditorCommandSource source) {
   DCHECK(frame().document());
   if (tryDHTMLPaste(AllMimeTypes))
     return;  // DHTML did the whole operation
   if (!canPaste())
     return;
   spellChecker().updateMarkersForWordsAffectedByEditing(false);
   ResourceFetcher* loader = frame().document()->fetcher();
   ResourceCacheValidationSuppressor validationSuppressor(loader);
 
   PasteMode pasteMode = frame().selection().isContentRichlyEditable()
                             ? AllMimeTypes
                             : PlainTextOnly;
 
-  if (source == EditCommandSource::kMenuOrKeyBinding) {
+  if (source == CommandFromMenuOrKeyBinding) {
     DataTransfer* dataTransfer =
         DataTransfer::create(DataTransfer::CopyAndPaste, DataTransferReadable,
                              DataObject::createFromPasteboard(pasteMode));
 
     if (dispatchBeforeInputDataTransfer(findEventTargetFromSelection(),
                                         InputEvent::InputType::InsertFromPaste,
                                         dataTransfer, nullptr) !=
         DispatchEventResult::NotCanceled)
       return;
     // 'beforeinput' event handler may destroy target frame.
     if (m_frame->document()->frame() != m_frame)
       return;
   }
 
   if (pasteMode == AllMimeTypes)
     pasteWithPasteboard(Pasteboard::generalPasteboard());
   else
     pasteAsPlainTextWithPasteboard(Pasteboard::generalPasteboard());
 }
 
-void Editor::pasteAsPlainText(EditCommandSource source) {
+void Editor::pasteAsPlainText(EditorCommandSource source) {
   if (tryDHTMLPaste(PlainTextOnly))
     return;
   if (!canPaste())
     return;
   spellChecker().updateMarkersForWordsAffectedByEditing(false);
   pasteAsPlainTextWithPasteboard(Pasteboard::generalPasteboard());
 }
 
 void Editor::performDelete() {
   if (!canDelete())
@@ skipping 533 matching lines @@
 }
 
 DEFINE_TRACE(Editor) {
   visitor->trace(m_frame);
   visitor->trace(m_lastEditCommand);
   visitor->trace(m_undoStack);
   visitor->trace(m_mark);
 }
 
 }  // namespace blink