Use RelocatablePosition in CompositeEditCommand::MoveParagraphWithClones

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

 /*
  * Copyright (C) 2005, 2006, 2007, 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 1248 matching lines @@
 
 void CompositeEditCommand::MoveParagraphWithClones(
     const VisiblePosition& start_of_paragraph_to_move,
     const VisiblePosition& end_of_paragraph_to_move,
     HTMLElement* block_element,
     Node* outer_node,
     EditingState* editing_state) {
   DCHECK(outer_node);
   DCHECK(block_element);
 
-  VisiblePosition before_paragraph =
-      PreviousPositionOf(start_of_paragraph_to_move);
-  VisiblePosition after_paragraph = NextPositionOf(end_of_paragraph_to_move);
+  RelocatablePosition relocatable_before_paragraph(
+      PreviousPositionOf(start_of_paragraph_to_move).DeepEquivalent());
+  RelocatablePosition relocatable_after_paragraph(
+      NextPositionOf(end_of_paragraph_to_move).DeepEquivalent());
 
   // We upstream() the end and downstream() the start so that we don't include
   // collapsed whitespace in the move. When we paste a fragment, spaces after
   // the end and before the start are treated as though they were rendered.
   Position start =
       MostForwardCaretPosition(start_of_paragraph_to_move.DeepEquivalent());
   Position end = start_of_paragraph_to_move.DeepEquivalent() ==
                          end_of_paragraph_to_move.DeepEquivalent()
                      ? start
                      : MostBackwardCaretPosition(
@@ skipping 22 matching lines @@
 
   // Add a br if pruning an empty block level element caused a collapse.  For
   // example:
   // foo^
   // <div>bar</div>
   // baz
   // Imagine moving 'bar' to ^.  'bar' will be deleted and its div pruned.  That
   // would cause 'baz' to collapse onto the line with 'foobar' unless we insert
   // a br. Must recononicalize these two VisiblePositions after the pruning
   // above.
-  // TODO(yosin): We should abort when |beforeParagraph| is a orphan when
-  // we have a sample.
-  before_paragraph = CreateVisiblePosition(before_paragraph.DeepEquivalent());
-  if (after_paragraph.IsOrphan()) {
-    editing_state->Abort();
-    return;
-  }
-  after_paragraph = CreateVisiblePosition(after_paragraph.DeepEquivalent());
+  const VisiblePosition& before_paragraph =
+      CreateVisiblePosition(relocatable_before_paragraph.GetPosition());
+  const VisiblePosition& after_paragraph =
+      CreateVisiblePosition(relocatable_after_paragraph.GetPosition());
 
   if (before_paragraph.IsNotNull() &&
       !IsDisplayInsideTable(before_paragraph.DeepEquivalent().AnchorNode()) &&
       ((!IsEndOfParagraph(before_paragraph) &&
         !IsStartOfParagraph(before_paragraph)) ||
        before_paragraph.DeepEquivalent() == after_paragraph.DeepEquivalent())) {
     // FIXME: Trim text between beforeParagraph and afterParagraph if they
     // aren't equal.
     InsertNodeAt(HTMLBRElement::Create(GetDocument()),
                  before_paragraph.DeepEquivalent(), editing_state);
@@ skipping 646 matching lines @@
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->Trace(commands_);
   visitor->Trace(starting_selection_);
   visitor->Trace(ending_selection_);
   visitor->Trace(undo_step_);
   EditCommand::Trace(visitor);
 }
 
 }  // namespace blink