Apply RelocatablePosition in DeleteSelectionCommand::mergeParagraphs

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 800 matching lines @@
   // content inside of it to move, so just remove it.
   Element* endBlock = enclosingBlock(m_downstreamEnd.anchorNode());
   if (!endBlock ||
       !endBlock->contains(
           startOfParagraphToMove.deepEquivalent().anchorNode()) ||
       !startOfParagraphToMove.deepEquivalent().anchorNode()) {
     removeNode(enclosingBlock(m_downstreamEnd.anchorNode()), editingState);
     return;
   }
 
+  RelocatablePosition relocatableStart(startOfParagraphToMove.deepEquivalent());
+
   // We need to merge into m_upstreamStart's block, but it's been emptied out
   // and collapsed by deletion.
   if (!mergeDestination.deepEquivalent().anchorNode() ||
       (!mergeDestination.deepEquivalent().anchorNode()->isDescendantOf(
            enclosingBlock(m_upstreamStart.computeContainerNode())) &&
        (!mergeDestination.deepEquivalent().anchorNode()->hasChildren() ||
         !m_upstreamStart.computeContainerNode()->hasChildren())) ||
       (m_startsAtEmptyLine &&
        mergeDestination.deepEquivalent() !=
            startOfParagraphToMove.deepEquivalent())) {
-    PositionWithAffinity storedStartOfParagraphToMove =
-        startOfParagraphToMove.toPositionWithAffinity();
     insertNodeAt(HTMLBRElement::create(document()), m_upstreamStart,
                  editingState);
     if (editingState->isAborted())
       return;
     document().updateStyleAndLayoutIgnorePendingStylesheets();
     mergeDestination = createVisiblePosition(m_upstreamStart);
-    startOfParagraphToMove =
-        createVisiblePosition(storedStartOfParagraphToMove);
+    startOfParagraphToMove = createVisiblePosition(relocatableStart.position());
   }
 
   if (mergeDestination.deepEquivalent() ==
       startOfParagraphToMove.deepEquivalent())
     return;
 
   VisiblePosition endOfParagraphToMove =
       endOfParagraph(startOfParagraphToMove, CanSkipOverEditingBoundary);
 
   if (mergeDestination.deepEquivalent() ==
@@ skipping 28 matching lines @@
           absoluteCaretBoundsOf(mergeDestination).x()) {
     if (isHTMLBRElement(
             *mostForwardCaretPosition(mergeDestination.deepEquivalent())
                  .anchorNode())) {
       removeNodeAndPruneAncestors(
           mostForwardCaretPosition(mergeDestination.deepEquivalent())
               .anchorNode(),
           editingState);
       if (editingState->isAborted())
         return;
-      m_endingPosition = startOfParagraphToMove.deepEquivalent();
+      m_endingPosition = relocatableStart.position();
       return;
     }
   }
 
   // Block images, tables and horizontal rules cannot be made inline with
   // content at mergeDestination.  If there is any
   // (!isStartOfParagraph(mergeDestination)), don't merge, just move
   // the caret to just before the selection we deleted. See
   // https://bugs.webkit.org/show_bug.cgi?id=25439
   if (isRenderedAsNonInlineTableImageOrHR(
@@ skipping 327 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