Introduce computePositionForNodeRemoval() as replacement of updatePositionForNodeRemoval()

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

 /*
  * Copyright (C) 2005 Apple Computer, 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 499 matching lines @@
       m_needPlaceholder = true;
   }
   if (node == m_endBlock) {
     VisiblePosition next =
         nextPositionOf(VisiblePosition::lastPositionInNode(m_endBlock.get()));
     if (next.isNotNull() && !isStartOfBlock(next))
       m_needPlaceholder = true;
   }
 
   // FIXME: Update the endpoints of the range being deleted.
-  updatePositionForNodeRemoval(m_endingPosition, *node);
-  updatePositionForNodeRemoval(m_leadingWhitespace, *node);
-  updatePositionForNodeRemoval(m_trailingWhitespace, *node);
+  m_endingPosition = computePositionForNodeRemoval(m_endingPosition, *node);
+  m_leadingWhitespace =
+      computePositionForNodeRemoval(m_leadingWhitespace, *node);
+  m_trailingWhitespace =
+      computePositionForNodeRemoval(m_trailingWhitespace, *node);
 
   CompositeEditCommand::removeNode(node, editingState,
                                    shouldAssumeContentIsAlwaysEditable);
 }
 
 static void updatePositionForTextRemoval(Text* node,
                                          int offset,
                                          int count,
                                          Position& position) {
   if (!position.isOffsetInAnchor() || position.computeContainerNode() != node)
@@ skipping 131 matching lines @@
     while (node && node != m_downstreamEnd.anchorNode()) {
       if (comparePositions(firstPositionInOrBeforeNode(node),
                            m_downstreamEnd) >= 0) {
         // NodeTraversal::nextSkippingChildren just blew past the end position,
         // so stop deleting
         node = nullptr;
       } else if (!m_downstreamEnd.anchorNode()->isDescendantOf(node)) {
         Node* nextNode = NodeTraversal::nextSkippingChildren(*node);
         // if we just removed a node from the end container, update end position
         // so the check above will work
-        updatePositionForNodeRemoval(m_downstreamEnd, *node);
+        m_downstreamEnd = computePositionForNodeRemoval(m_downstreamEnd, *node);
         removeNode(node, editingState);
         if (editingState->isAborted())
           return;
         node = nextNode;
       } else {
         Node& n = NodeTraversal::lastWithinOrSelf(*node);
         if (m_downstreamEnd.anchorNode() == n &&
             m_downstreamEnd.computeEditingOffset() >= caretMaxOffset(&n)) {
           removeNode(node, editingState);
           if (editingState->isAborted())
@@ skipping 542 matching lines @@
   visitor->trace(m_deleteIntoBlockquoteStyle);
   visitor->trace(m_startRoot);
   visitor->trace(m_endRoot);
   visitor->trace(m_startTableRow);
   visitor->trace(m_endTableRow);
   visitor->trace(m_temporaryPlaceholder);
   CompositeEditCommand::trace(visitor);
 }
 
 }  // namespace blink