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

third_party/WebKit/Source/core/events/InputEvent.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/events/InputEvent.h"
 
 #include "core/dom/Range.h"
 #include "core/events/EventDispatcher.h"
 #include "public/platform/WebEditingCommandType.h"
 
@@ skipping 14 matching lines @@
     {InputEvent::InputType::InsertHorizontalRule, "insertHorizontalRule"},
     {InputEvent::InputType::InsertFromPaste, "insertFromPaste"},
     {InputEvent::InputType::InsertFromDrop, "insertFromDrop"},
     {InputEvent::InputType::InsertReplacementText, "insertReplacementText"},
     {InputEvent::InputType::DeleteComposedCharacterForward,
      "deleteComposedCharacterForward"},
     {InputEvent::InputType::DeleteComposedCharacterBackward,
      "deleteComposedCharacterBackward"},
     {InputEvent::InputType::DeleteWordBackward, "deleteWordBackward"},
     {InputEvent::InputType::DeleteWordForward, "deleteWordForward"},
-    {InputEvent::InputType::DeleteLineBackward, "deleteLineBackward"},
-    {InputEvent::InputType::DeleteLineForward, "deleteLineForward"},
+    {InputEvent::InputType::DeleteSoftLineBackward, "deleteSoftLineBackward"},
+    {InputEvent::InputType::DeleteSoftLineBackward, "deleteSoftLineForward"},
+    {InputEvent::InputType::DeleteContent, "deleteContent"},
     {InputEvent::InputType::DeleteContentBackward, "deleteContentBackward"},
     {InputEvent::InputType::DeleteContentForward, "deleteContentForward"},
     {InputEvent::InputType::DeleteByCut, "deleteByCut"},
     {InputEvent::InputType::DeleteByDrag, "deleteByDrag"},
     {InputEvent::InputType::HistoryUndo, "historyUndo"},
     {InputEvent::InputType::HistoryRedo, "historyRedo"},
     {InputEvent::InputType::FormatBold, "formatBold"},
     {InputEvent::InputType::FormatItalic, "formatItalic"},
     {InputEvent::InputType::FormatUnderline, "formatUnderline"},
     {InputEvent::InputType::FormatStrikeThrough, "formatStrikeThrough"},
@@ skipping 90 matching lines @@
   inputEventInit.setIsComposing(isComposing == IsComposing);
   if (ranges)
     inputEventInit.setRanges(*ranges);
   inputEventInit.setComposed(true);
   return InputEvent::create(EventTypeNames::beforeinput, inputEventInit);
 }
 
 /* static */
 InputEvent* InputEvent::createInput(InputType inputType,
                                     const String& data,
-                                    EventIsComposing isComposing,
-                                    const RangeVector* ranges) {
+                                    EventIsComposing isComposing) {
   InputEventInit inputEventInit;
 
   inputEventInit.setBubbles(true);
   inputEventInit.setCancelable(false);
   // TODO(ojan): We should find a way to prevent conversion like
   // String->enum->String just in order to use initializer.
   // See InputEvent::InputEvent() for the second conversion.
   inputEventInit.setInputType(convertInputTypeToString(inputType));
   inputEventInit.setData(data);
   inputEventInit.setIsComposing(isComposing == IsComposing);
-  if (ranges)
-    inputEventInit.setRanges(*ranges);
   inputEventInit.setComposed(true);
   return InputEvent::create(EventTypeNames::input, inputEventInit);
 }
 
 String InputEvent::inputType() const {
   return convertInputTypeToString(m_inputType);
 }
 
 StaticRangeVector InputEvent::getTargetRanges() const {
   StaticRangeVector staticRanges;
@@ skipping 46 matching lines @@
   //   3. We don't want authors to hold live |Range| indefinitely by holding
   //      |InputEvent|, so we clear them after dispatch.
   // Authors should explicitly call |getTargetRanges()|->|toRange()| if they
   // want to keep a copy of |Range|.  See Editing TF meeting notes:
   // https://docs.google.com/document/d/1hCj6QX77NYIVY0RWrMHT1Yra6t8_Qu8PopaWLG0AM58/edit?usp=sharing
   event().m_ranges.clear();
   return result;
 }
 
 }  // namespace blink