Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(369)

Unified Diff: third_party/WebKit/Source/core/editing/Editor.cpp

Issue 2636963003: Revert of [EditCommandSource] Rename and move |EditorCommandSource| to "CompositeEditCommand.h (1/3) (Closed)
Patch Set: Fix conflicts Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/editing/Editor.cpp
diff --git a/third_party/WebKit/Source/core/editing/Editor.cpp b/third_party/WebKit/Source/core/editing/Editor.cpp
index 0efff2a54a1b41f26e0e83ac85c13e7b3ae68500..811144a416ed2cd759e9481cb96c5f0c51d9be2a 100644
--- a/third_party/WebKit/Source/core/editing/Editor.cpp
+++ b/third_party/WebKit/Source/core/editing/Editor.cpp
@@ -1052,7 +1052,7 @@ bool Editor::insertParagraphSeparator() {
return true;
}
-void Editor::cut(EditCommandSource source) {
+void Editor::cut(EditorCommandSource source) {
if (tryDHTMLCut())
return; // DHTML did the whole operation
if (!canCut())
@@ -1076,7 +1076,7 @@ void Editor::cut(EditCommandSource source) {
writeSelectionToPasteboard();
}
- if (source == EditCommandSource::kMenuOrKeyBinding) {
+ if (source == CommandFromMenuOrKeyBinding) {
if (dispatchBeforeInputDataTransfer(findEventTargetFromSelection(),
InputEvent::InputType::DeleteByCut,
nullptr, nullptr) !=
@@ -1120,7 +1120,7 @@ void Editor::copy() {
}
}
-void Editor::paste(EditCommandSource source) {
+void Editor::paste(EditorCommandSource source) {
DCHECK(frame().document());
if (tryDHTMLPaste(AllMimeTypes))
return; // DHTML did the whole operation
@@ -1134,7 +1134,7 @@ void Editor::paste(EditCommandSource source) {
? AllMimeTypes
: PlainTextOnly;
- if (source == EditCommandSource::kMenuOrKeyBinding) {
+ if (source == CommandFromMenuOrKeyBinding) {
DataTransfer* dataTransfer =
DataTransfer::create(DataTransfer::CopyAndPaste, DataTransferReadable,
DataObject::createFromPasteboard(pasteMode));
@@ -1155,7 +1155,7 @@ void Editor::paste(EditCommandSource source) {
pasteAsPlainTextWithPasteboard(Pasteboard::generalPasteboard());
}
-void Editor::pasteAsPlainText(EditCommandSource source) {
+void Editor::pasteAsPlainText(EditorCommandSource source) {
if (tryDHTMLPaste(PlainTextOnly))
return;
if (!canPaste())

Powered by Google App Engine
This is Rietveld 408576698