Introduce computePositionForNodeRemoval() as replacement of updatePositionForNodeRemoval()

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

 /*
  * Copyright (C) 2005, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009, 2010, 2011 Google 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
@@ skipping 1825 matching lines @@
       (U16_IS_TRAIL(text->data()[0]) ||
        U16_IS_LEAD(text->data()[text->data().length() - 1]));
   if (!hasIncompleteSurrogate && text->data().length() > kMergeSizeLimit)
     return;
   if (text->previousSibling() && text->previousSibling()->isTextNode()) {
     Text* previous = toText(text->previousSibling());
     if (hasIncompleteSurrogate ||
         previous->data().length() <= kMergeSizeLimit) {
       insertTextIntoNode(text, 0, previous->data());
 
-      if (positionIsOffsetInAnchor)
+      if (positionIsOffsetInAnchor) {
         position =
             Position(position.computeContainerNode(),
                      previous->length() + position.offsetInContainerNode());
-      else
-        updatePositionForNodeRemoval(position, *previous);
+      } else {
+        position = computePositionForNodeRemoval(position, *previous);
+      }
 
       if (positionOnlyToBeUpdatedIsOffsetInAnchor) {
         if (positionOnlyToBeUpdated.computeContainerNode() == text)
           positionOnlyToBeUpdated = Position(
               text, previous->length() +
                         positionOnlyToBeUpdated.offsetInContainerNode());
         else if (positionOnlyToBeUpdated.computeContainerNode() == previous)
           positionOnlyToBeUpdated =
               Position(text, positionOnlyToBeUpdated.offsetInContainerNode());
       } else {
-        updatePositionForNodeRemoval(positionOnlyToBeUpdated, *previous);
+        positionOnlyToBeUpdated =
+            computePositionForNodeRemoval(positionOnlyToBeUpdated, *previous);
       }
 
       removeNode(previous, editingState);
       if (editingState->isAborted())
         return;
     }
   }
   if (text->nextSibling() && text->nextSibling()->isTextNode()) {
     Text* next = toText(text->nextSibling());
     if (!hasIncompleteSurrogate && next->data().length() > kMergeSizeLimit)
       return;
     unsigned originalLength = text->length();
     insertTextIntoNode(text, originalLength, next->data());
 
     if (!positionIsOffsetInAnchor)
-      updatePositionForNodeRemoval(position, *next);
+      position = computePositionForNodeRemoval(position, *next);
 
     if (positionOnlyToBeUpdatedIsOffsetInAnchor &&
-        positionOnlyToBeUpdated.computeContainerNode() == next)
+        positionOnlyToBeUpdated.computeContainerNode() == next) {
       positionOnlyToBeUpdated =
           Position(text, originalLength +
                              positionOnlyToBeUpdated.offsetInContainerNode());
-    else
-      updatePositionForNodeRemoval(positionOnlyToBeUpdated, *next);
+    } else {
+      positionOnlyToBeUpdated =
+          computePositionForNodeRemoval(positionOnlyToBeUpdated, *next);
+    }
 
     removeNode(next, editingState);
     if (editingState->isAborted())
       return;
   }
 }
 
 InputEvent::InputType ReplaceSelectionCommand::inputType() const {
   // |ReplaceSelectionCommand| could be used with Paste, Drag&Drop,
   // InsertFragment and |TypingCommand|.
@@ skipping 137 matching lines @@
   visitor->trace(m_startOfInsertedContent);
   visitor->trace(m_endOfInsertedContent);
   visitor->trace(m_insertionStyle);
   visitor->trace(m_documentFragment);
   visitor->trace(m_startOfInsertedRange);
   visitor->trace(m_endOfInsertedRange);
   CompositeEditCommand::trace(visitor);
 }
 
 }  // namespace blink