Editing: Make the |EditingState*| argument of CompositeEditCommand::removeNode mandatory.

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

 /*
  * Copyright (C) 2006, 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 48 matching lines @@
     return node && node->layoutObject() && node->layoutObject()->isInline();
 }
 
 
 IndentOutdentCommand::IndentOutdentCommand(Document& document, EIndentType typeOfAction)
     : ApplyBlockElementCommand(document, blockquoteTag, "margin: 0 0 0 40px; border: none; padding: 0px;")
     , m_typeOfAction(typeOfAction)
 {
 }
 
-bool IndentOutdentCommand::tryIndentingAsListItem(const Position& start, const Position& end)
+bool IndentOutdentCommand::tryIndentingAsListItem(const Position& start, const Position& end, EditingState* editingState)
 {
     // If our selection is not inside a list, bail out.
     RefPtrWillBeRawPtr<Node> lastNodeInSelectedParagraph = start.anchorNode();
     RefPtrWillBeRawPtr<HTMLElement> listElement = enclosingList(lastNodeInSelectedParagraph.get());
     if (!listElement)
         return false;
 
     // Find the block that we want to indent.  If it's not a list item (e.g., a div inside a list item), we bail out.
     RefPtrWillBeRawPtr<Element> selectedListItem = enclosingBlock(lastNodeInSelectedParagraph.get());
 
     // FIXME: we need to deal with the case where there is no li (malformed HTML)
     if (!isHTMLLIElement(selectedListItem))
         return false;
 
     // FIXME: previousElementSibling does not ignore non-rendered content like <span></span>.  Should we?
     RefPtrWillBeRawPtr<Element> previousList = ElementTraversal::previousSibling(*selectedListItem);
     RefPtrWillBeRawPtr<Element> nextList = ElementTraversal::nextSibling(*selectedListItem);
 
     // We should calculate visible range in list item because inserting new
     // list element will change visibility of list item, e.g. :first-child
     // CSS selector.
     RefPtrWillBeRawPtr<HTMLElement> newList = toHTMLElement(document().createElement(listElement->tagQName(), false).get());
-    insertNodeBefore(newList, selectedListItem.get());
+    insertNodeBefore(newList, selectedListItem.get(), editingState);
+    if (editingState->isAborted())
+        return false;
 
     // We should clone all the children of the list item for indenting purposes. However, in case the current
     // selection does not encompass all its children, we need to explicitally handle the same. The original
     // list item too would require proper deletion in that case.
     if (end.anchorNode() == selectedListItem.get() || end.anchorNode()->isDescendantOf(selectedListItem->lastChild())) {
-        moveParagraphWithClones(createVisiblePosition(start), createVisiblePosition(end), newList.get(), selectedListItem.get());
+        moveParagraphWithClones(createVisiblePosition(start), createVisiblePosition(end), newList.get(), selectedListItem.get(), editingState);
     } else {
-        moveParagraphWithClones(createVisiblePosition(start), createVisiblePosition(positionAfterNode(selectedListItem->lastChild())), newList.get(), selectedListItem.get());
-        removeNode(selectedListItem.get());
+        moveParagraphWithClones(createVisiblePosition(start), createVisiblePosition(positionAfterNode(selectedListItem->lastChild())), newList.get(), selectedListItem.get(), editingState);
+        if (editingState->isAborted())
+            return false;
+        removeNode(selectedListItem.get(), editingState);
     }
+    if (editingState->isAborted())
+        return false;
 
-    if (canMergeLists(previousList.get(), newList.get()))
-        mergeIdenticalElements(previousList.get(), newList.get());
-    if (canMergeLists(newList.get(), nextList.get()))
-        mergeIdenticalElements(newList.get(), nextList.get());
+    if (canMergeLists(previousList.get(), newList.get())) {
+        mergeIdenticalElements(previousList.get(), newList.get(), editingState);
+        if (editingState->isAborted())
+            return false;
+    }
+    if (canMergeLists(newList.get(), nextList.get())) {
+        mergeIdenticalElements(newList.get(), nextList.get(), editingState);
+        if (editingState->isAborted())
+            return false;
+    }
 
     return true;
 }
 
 void IndentOutdentCommand::indentIntoBlockquote(const Position& start, const Position& end, RefPtrWillBeRawPtr<HTMLElement>& targetBlockquote, EditingState* editingState)
 {
     Element* enclosingCell = toElement(enclosingNodeOfType(start, &isTableCell));
     Element* elementToSplitTo;
     if (enclosingCell)
         elementToSplitTo = enclosingCell;
@@ skipping 136 matching lines @@
 void IndentOutdentCommand::formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection, EditingState* editingState)
 {
     if (m_typeOfAction == Indent)
         ApplyBlockElementCommand::formatSelection(startOfSelection, endOfSelection, editingState);
     else
         outdentRegion(startOfSelection, endOfSelection);
 }
 
 void IndentOutdentCommand::formatRange(const Position& start, const Position& end, const Position&, RefPtrWillBeRawPtr<HTMLElement>& blockquoteForNextIndent, EditingState* editingState)
 {
-    if (tryIndentingAsListItem(start, end))
+    bool indentingAsListItemResult = tryIndentingAsListItem(start, end, editingState);
+    if (editingState->isAborted())
+        return;
+    if (indentingAsListItemResult)
         blockquoteForNextIndent = nullptr;
     else
         indentIntoBlockquote(start, end, blockquoteForNextIndent, editingState);
 }
 
 } // namespace blink