Introduce computePositionForNodeRemoval() as replacement of updatePositionForNodeRemoval()

third_party/WebKit/Source/core/editing/EditingUtilities.cpp

Index: third_party/WebKit/Source/core/editing/EditingUtilities.cpp
diff --git a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
index 84465a98b3694b3151cd5ee1d645ecad398ba61f..8fe6ece2b566c99de167b6dc0f33fca12ad34568 100644
--- a/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
+++ b/third_party/WebKit/Source/core/editing/EditingUtilities.cpp
@@ -1739,39 +1739,45 @@ PositionWithAffinity positionRespectingEditingBoundary(
   return targetNode->layoutObject()->positionForPoint(selectionEndPoint);
 }
 
-void updatePositionForNodeRemoval(Position& position, Node& node) {
+Position computePositionForNodeRemoval(const Position& position, Node& node) {
   if (position.isNull())
-    return;
+    return position;
   switch (position.anchorType()) {
     case PositionAnchorType::BeforeChildren:
-      if (node.isShadowIncludingInclusiveAncestorOf(
-              position.computeContainerNode()))
-        position = Position::inParentBeforeNode(node);
-      break;
+      if (!node.isShadowIncludingInclusiveAncestorOf(
+              position.computeContainerNode())) {
+        return position;
+      }
+      return Position::inParentBeforeNode(node);
     case PositionAnchorType::AfterChildren:
-      if (node.isShadowIncludingInclusiveAncestorOf(
-              position.computeContainerNode()))
-        position = Position::inParentAfterNode(node);
-      break;
+      if (!node.isShadowIncludingInclusiveAncestorOf(
+              position.computeContainerNode())) {
+        return position;
+      }
+      return Position::inParentAfterNode(node);
     case PositionAnchorType::OffsetInAnchor:
       if (position.computeContainerNode() == node.parentNode() &&
           static_cast<unsigned>(position.offsetInContainerNode()) >
-              node.nodeIndex())
-        position = Position(position.computeContainerNode(),
-                            position.offsetInContainerNode() - 1);
-      else if (node.isShadowIncludingInclusiveAncestorOf(
-                   position.computeContainerNode()))
-        position = Position::inParentBeforeNode(node);
-      break;
+              node.nodeIndex()) {
+        return Position(position.computeContainerNode(),
+                        position.offsetInContainerNode() - 1);
+      }
+      if (!node.isShadowIncludingInclusiveAncestorOf(
+              position.computeContainerNode())) {
+        return position;
+      }
+      return Position::inParentBeforeNode(node);
     case PositionAnchorType::AfterAnchor:
-      if (node.isShadowIncludingInclusiveAncestorOf(position.anchorNode()))
-        position = Position::inParentAfterNode(node);
-      break;
+      if (!node.isShadowIncludingInclusiveAncestorOf(position.anchorNode()))
+        return position;
+      return Position::inParentAfterNode(node);
     case PositionAnchorType::BeforeAnchor:
-      if (node.isShadowIncludingInclusiveAncestorOf(position.anchorNode()))
-        position = Position::inParentBeforeNode(node);
-      break;
+      if (!node.isShadowIncludingInclusiveAncestorOf(position.anchorNode()))
+        return position;
+      return Position::inParentBeforeNode(node);
   }
+  NOTREACHED() << "We should handle all PositionAnchorType";
+  return position;
 }
 
 bool isMailHTMLBlockquoteElement(const Node* node) {