[InputEvent] Add 'beforeinput' logic in |will*()| and guarded by a flag (3/11)

third_party/WebKit/Source/core/editing/commands/CompositeEditCommand.cpp

 /*
  * Copyright (C) 2005, 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 60 matching lines @@
 #include "core/html/HTMLQuoteElement.h"
 #include "core/html/HTMLSpanElement.h"
 #include "core/layout/LayoutBlock.h"
 #include "core/layout/LayoutListItem.h"
 #include "core/layout/LayoutText.h"
 #include "core/layout/line/InlineTextBox.h"
 #include <algorithm>
 
 namespace blink {
 
+namespace {
+
+InputEvent::EventCancelable isCancelableFromCommand(
+    const CompositeEditCommand* command) {
+  if (command->isTypingCommand() &&
+      toTypingCommand(command)->compositionType() ==
+          TypingCommand::TextCompositionUpdate)
+    return InputEvent::NotCancelable;
+  return InputEvent::IsCancelable;
+}
+
+}  // anonymous namespace
+
 using namespace HTMLNames;
 
 EditCommandComposition* EditCommandComposition::create(
     Document* document,
     const VisibleSelection& startingSelection,
     const VisibleSelection& endingSelection) {
   return new EditCommandComposition(document, startingSelection,
                                     endingSelection);
 }
 
@@ skipping 52 matching lines @@
   m_document->updateStyleAndLayoutIgnorePendingStylesheets();
 
   {
     for (const auto& command : m_commands)
       command->doReapply();
   }
 
   frame->editor().reappliedEditing(this);
 }
 
-bool EditCommandComposition::willUnapply(EditCommandSource, BeforeInputTiming) {
-  // TODO(chongz): Fire 'beforeinput' for 'historyUndo'.
-  return true;
+bool EditCommandComposition::willUnapply(EditCommandSource source,
+                                         BeforeInputTiming beforeInputTiming) {
+  if (beforeInputTiming != BeforeInputTiming::kShouldFireInCommand)
+    return true;
+  return dispatchBeforeInputEvent(source, m_document->frame(), m_document,
+                                  InputEvent::InputType::HistoryUndo, nullAtom,
+                                  nullptr, InputEvent::IsCancelable,
+                                  InputEvent::NotComposing, nullptr);
 }
 
-bool EditCommandComposition::willReapply(EditCommandSource, BeforeInputTiming) {
-  // TODO(chongz): Fire 'beforeinput' for 'historyRedo'.
-  return true;
+bool EditCommandComposition::willReapply(EditCommandSource source,
+                                         BeforeInputTiming beforeInputTiming) {
+  if (beforeInputTiming != BeforeInputTiming::kShouldFireInCommand)
+    return true;
+  return dispatchBeforeInputEvent(source, m_document->frame(), m_document,
+                                  InputEvent::InputType::HistoryRedo, nullAtom,
+                                  nullptr, InputEvent::IsCancelable,
+                                  InputEvent::NotComposing, nullptr);
 }
 
 void EditCommandComposition::append(SimpleEditCommand* command) {
   m_commands.push_back(command);
 }
 
 void EditCommandComposition::append(EditCommandComposition* composition) {
   m_commands.appendVector(composition->m_commands);
 }
 
@@ skipping 49 matching lines @@
       case InputEvent::InputType::DeleteByDrag:
       case InputEvent::InputType::None:
         break;
       default:
         NOTREACHED();
         return false;
     }
   }
   ensureComposition();
 
+  // Covers the initial TypingCommand and other top-level commands.
+  // TypingCommand::willAddTypingToOpenCommand() also calls willApplyEditing().
+  if (!willApplyEditing(source, beforeInputTiming))
+    return false;
+
   // Changes to the document may have been made since the last editing operation
   // that require a layout, as in <rdar://problem/5658603>. Low level
   // operations, like RemoveNodeCommand, don't require a layout because the high
   // level operations that use them perform one if one is necessary (like for
   // the creation of VisiblePositions).
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
-  if (!willApplyEditing(source, beforeInputTiming))
-    return false;
-
   LocalFrame* frame = document().frame();
   DCHECK(frame);
   EditingState editingState;
   {
     EventQueueScope eventQueueScope;
     doApply(&editingState);
   }
 
   // Only need to call appliedEditing for top-level commands, and TypingCommands
   // do it on their own (see TypingCommand::typingAddedToOpenCommand).
   if (!isTypingCommand())
     frame->editor().appliedEditing(this);
   setShouldRetainAutocorrectionIndicator(false);
   return !editingState.isAborted();
 }
 
 EditCommandComposition* CompositeEditCommand::ensureComposition() {
   CompositeEditCommand* command = this;
   while (command && command->parent())
     command = command->parent();
   if (!command->m_composition) {
     command->m_composition = EditCommandComposition::create(
         &document(), startingSelection(), endingSelection());
   }
   return command->m_composition.get();
 }
 
-bool CompositeEditCommand::willApplyEditing(EditCommandSource,
-                                            BeforeInputTiming) {
-  // TODO(chongz): Move all the 'beforeinput' dispatching logic here.
-  return true;
+bool CompositeEditCommand::willApplyEditing(
+    EditCommandSource source,
+    BeforeInputTiming beforeInputTiming) {
+  if (beforeInputTiming != BeforeInputTiming::kShouldFireInCommand)
+    return true;
+  return dispatchBeforeInputEvent(
+      source, document().frame(),
+      ensureComposition()->startingRootEditableElement(), inputType(),
+      textDataForInputEvent(), dataTransferForInputEvent(),
+      isCancelableFromCommand(this), isComposingFromCommand(this),
+      targetRangesForInputEvent());
 }
 
 InputEvent::InputType CompositeEditCommand::inputType() const {
   return InputEvent::InputType::None;
 }
 
 String CompositeEditCommand::textDataForInputEvent() const {
   return nullAtom;
 }
 
@@ skipping 1791 matching lines @@
   return node;
 }
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->trace(m_commands);
   visitor->trace(m_composition);
   EditCommand::trace(visitor);
 }
 
 }  // namespace blink