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

third_party/WebKit/Source/core/editing/EditingUtilities.h

Index: third_party/WebKit/Source/core/editing/EditingUtilities.h
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.h b/third_party/WebKit/Source/core/editing/EditingUtilities.h
index 0b334ec53ffe6695c93391388a89bec3ff590747..0337d9cd20f077f1005feca1d647b0639f4f1f81 100644
--- a/third_party/WebKit/Source/core/editing/EditingUtilities.h
+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.h
@@ -58,6 +58,8 @@ enum class DeleteDirection {
   Backward,
 };
 
+enum class EditCommandSource;
+class CompositeEditCommand;
 class Document;
 class Element;
 class HTMLElement;
@@ -411,28 +413,33 @@ String stringWithRebalancedWhitespace(const String&,
 const String& nonBreakingSpaceString();
 
 // -------------------------------------------------------------------------
-// Events
+// InputEvent
 // -------------------------------------------------------------------------
 
-// Functions dispatch InputEvent
-DispatchEventResult dispatchBeforeInputInsertText(EventTarget*,
-                                                  const String& data);
-DispatchEventResult dispatchBeforeInputFromComposition(
-    EventTarget*,
-    InputEvent::InputType,
-    const String& data,
-    InputEvent::EventCancelable);
-DispatchEventResult dispatchBeforeInputEditorCommand(EventTarget*,
-                                                     InputEvent::InputType,
-                                                     const RangeVector*);
-DispatchEventResult dispatchBeforeInputDataTransfer(EventTarget*,
-                                                    InputEvent::InputType,
-                                                    DataTransfer*,
-                                                    const RangeVector*);

[chongz, 2016/12/20 23:27:51]

Combined into a single |dispatchBeforeInputEvent()| below.

-
 InputEvent::InputType deletionInputTypeFromTextGranularity(DeleteDirection,
                                                            TextGranularity);
 
+// TODO(chongz): Move |isComposingFromCommand()| and |isCancelableFromCommand|
+// to 'CompositeEditCommand.cpp' after we've moved |Editor::appliedEditing()| to
+// |CompositeEditCommand::appliedEditing()|.
+// https://crbug.com/676001
+InputEvent::EventIsComposing isComposingFromCommand(

[chongz, 2016/12/20 23:27:51]

Moved from |Editor.cpp::isComposingFromCommand()|.

+    const CompositeEditCommand*);
+InputEvent::EventCancelable isCancelableFromCommand(

[chongz, 2016/12/20 23:27:51]

New method.

+    const CompositeEditCommand*);
+
+// TODO(chongz): Move |dispatchBeforeInputEvent()| to 'CompositeEditCommand.cpp'
+// after we've resolved the ordering issue WRT 'compositionupdate'.
+// https://crbug.com/675820
+bool dispatchBeforeInputEvent(EditCommandSource,

[chongz, 2016/12/20 23:27:51]

Combined from 4x |dispatchBeforeInput*()| above.

+                              LocalFrame*,
+                              Node* target,
+                              InputEvent::InputType,
+                              const String& data,
+                              DataTransfer*,
+                              InputEvent::EventCancelable,
+                              InputEvent::EventIsComposing,
+                              const RangeVector*);
 }  // namespace blink
 
 #endif