Ensure valid input for CompositeEditCommand::moveParagraph[s]

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 1464 matching lines @@
       ((!isEndOfParagraph(beforeParagraph) &&
         !isStartOfParagraph(beforeParagraph)) ||
        beforeParagraph.deepEquivalent() == afterParagraph.deepEquivalent())) {
     // FIXME: Trim text between beforeParagraph and afterParagraph if they
     // aren't equal.
     insertNodeAt(HTMLBRElement::create(document()),
                  beforeParagraph.deepEquivalent(), editingState);
   }
 }
 
-// TODO(xiaochengh): Ensure valid VisiblePositions are passed to this function.
 void CompositeEditCommand::moveParagraph(
     const VisiblePosition& startOfParagraphToMove,
     const VisiblePosition& endOfParagraphToMove,
     const VisiblePosition& destination,
     EditingState* editingState,
     ShouldPreserveSelection shouldPreserveSelection,
     ShouldPreserveStyle shouldPreserveStyle,
     Node* constrainingAncestor) {
-  DCHECK(isStartOfParagraphDeprecated(startOfParagraphToMove))
-      << startOfParagraphToMove;
-  DCHECK(isEndOfParagraphDeprecated(endOfParagraphToMove))
-      << endOfParagraphToMove;
+  DCHECK(!document().needsLayoutTreeUpdate());
+  DCHECK(isStartOfParagraph(startOfParagraphToMove)) << startOfParagraphToMove;
+  DCHECK(isEndOfParagraph(endOfParagraphToMove)) << endOfParagraphToMove;
   moveParagraphs(startOfParagraphToMove, endOfParagraphToMove, destination,
                  editingState, shouldPreserveSelection, shouldPreserveStyle,
                  constrainingAncestor);
 }
 
-// TODO(xiaochengh): Ensure valid VisiblePositions are passed to this function,
-// and do proper recalculation after mutations so that they are still valid when
-// being used.
 void CompositeEditCommand::moveParagraphs(
     const VisiblePosition& startOfParagraphToMove,
     const VisiblePosition& endOfParagraphToMove,
     const VisiblePosition& destination,
     EditingState* editingState,
     ShouldPreserveSelection shouldPreserveSelection,
     ShouldPreserveStyle shouldPreserveStyle,
     Node* constrainingAncestor) {
+  DCHECK(!document().needsLayoutTreeUpdate());
   if (startOfParagraphToMove.deepEquivalent() == destination.deepEquivalent() ||
       startOfParagraphToMove.isNull())
     return;
 
-  document().updateStyleAndLayoutIgnorePendingStylesheets();
-
   int startIndex = -1;
   int endIndex = -1;
   int destinationIndex = -1;
   bool originalIsDirectional = endingSelection().isDirectional();
   if (shouldPreserveSelection == PreserveSelection &&
       !endingSelection().isNone()) {
     VisiblePosition visibleStart = endingSelection().visibleStart();
     VisiblePosition visibleEnd = endingSelection().visibleEnd();
 
     bool startAfterParagraph =
@@ skipping 15 matching lines @@
 
       endIndex = 0;
       if (endInParagraph)
         endIndex = TextIterator::rangeLength(
             startOfParagraphToMove.toParentAnchoredPosition(),
             visibleEnd.toParentAnchoredPosition(), true);
     }
   }
 
   RelocatablePosition beforeParagraphPosition(
-      previousPositionOfDeprecated(startOfParagraphToMove,
-                                   CannotCrossEditingBoundary)
+      previousPositionOf(startOfParagraphToMove, CannotCrossEditingBoundary)
           .deepEquivalent());
   RelocatablePosition afterParagraphPosition(
-      nextPositionOfDeprecated(endOfParagraphToMove, CannotCrossEditingBoundary)
+      nextPositionOf(endOfParagraphToMove, CannotCrossEditingBoundary)
           .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(startOfParagraphToMove.deepEquivalent());
   Position end =
       mostBackwardCaretPosition(endOfParagraphToMove.deepEquivalent());
 
@@ skipping 74 matching lines @@
       return;
   }
 
   // TextIterator::rangeLength requires clean layout.
   document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   destinationIndex = TextIterator::rangeLength(
       Position::firstPositionInNode(document().documentElement()),
       destination.toParentAnchoredPosition(), true);
 
-  VisibleSelection destinationSelection =
-      createVisibleSelectionDeprecated(destination, originalIsDirectional);
+  VisibleSelection destinationSelection = createVisibleSelection(
+      destination.toPositionWithAffinity(), originalIsDirectional);
   if (endingSelection().isNone()) {
     // We abort executing command since |destination| becomes invisible.
     editingState->abort();
     return;
   }
   setEndingSelection(destinationSelection);
   ReplaceSelectionCommand::CommandOptions options =
       ReplaceSelectionCommand::SelectReplacement |
       ReplaceSelectionCommand::MovingParagraph;
   if (shouldPreserveStyle == DoNotPreserveStyle)
@@ skipping 355 matching lines @@
   return node;
 }
 
 DEFINE_TRACE(CompositeEditCommand) {
   visitor->trace(m_commands);
   visitor->trace(m_composition);
   EditCommand::trace(visitor);
 }
 
 }  // namespace blink