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

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 183 matching lines @@
       case InputEvent::InputType::InsertText:
       case InputEvent::InputType::InsertLineBreak:
       case InputEvent::InputType::InsertParagraph:
       case InputEvent::InputType::InsertFromPaste:
       case InputEvent::InputType::InsertFromDrop:
       case InputEvent::InputType::InsertReplacementText:
       case InputEvent::InputType::DeleteComposedCharacterForward:
       case InputEvent::InputType::DeleteComposedCharacterBackward:
       case InputEvent::InputType::DeleteWordBackward:
       case InputEvent::InputType::DeleteWordForward:
-      case InputEvent::InputType::DeleteLineBackward:
-      case InputEvent::InputType::DeleteLineForward:
+      case InputEvent::InputType::DeleteSoftLineBackward:
+      case InputEvent::InputType::DeleteSoftLineForward:
+      case InputEvent::InputType::DeleteContent:
       case InputEvent::InputType::DeleteContentBackward:
       case InputEvent::InputType::DeleteContentForward:
       case InputEvent::InputType::DeleteByCut:
       case InputEvent::InputType::DeleteByDrag:
       case InputEvent::InputType::None:
         break;
       default:
         NOTREACHED();
         return false;
     }
   }
   ensureComposition();
 
   // 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();
 
+  // Covers the initial TypingCommand and other top-level commands.
+  // See TypingCommand::willAddTypingToOpenCommand().
+  if (!willApply())
+    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).
@@ skipping 187 matching lines @@
     // Mutation events (bug 22634) from the text node insertion may have removed
     // the refChild
     if (!refChild->isConnected())
       return;
     insertNodeBefore(insertChild, refChild, editingState);
   } else {
     insertNodeAfter(insertChild, refChild, editingState);
   }
 }
 
+bool CompositeEditCommand::willApply() {
+  LocalFrame* frame = document().frame();
+  DCHECK(frame);

[yosin_UTC9, 2016/12/07 07:51:27]

No need to have |DCHECK(frame)| since next line uses it.

[chongz, 2016/12/07 15:22:21]

Done.

+  return frame->editor().willApplyEditing(this);
+}
+
 void CompositeEditCommand::appendNode(Node* node,
                                       ContainerNode* parent,
                                       EditingState* editingState) {
   // When cloneParagraphUnderNewElement() clones the fallback content
   // of an OBJECT element, the ASSERT below may fire since the return
   // value of canHaveChildrenForEditing is not reliable until the layout
   // object of the OBJECT is created. Hence we ignore this check for OBJECTs.
   // TODO(yosin): We should move following |ABORT_EDITING_COMMAND_IF|s to
   // |AppendNodeCommand|.
   // TODO(yosin): We should get rid of |canHaveChildrenForEditing()|, since
@@ skipping 1586 matching lines @@
   return node;
 }
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->trace(m_commands);
   visitor->trace(m_composition);
   EditCommand::trace(visitor);
 }
 
 }  // namespace blink