Mark paragraph-related functions deprecated in VisibleUnits

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

 /*
  * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2010 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 54 matching lines @@
         return;
 
     // When a selection ends at the start of a paragraph, we rarely paint
     // the selection gap before that paragraph, because there often is no gap.
     // In a case like this, it's not obvious to the user that the selection
     // ends "inside" that paragraph, so it would be confusing if Indent/Outdent
     // operated on that paragraph.
     // FIXME: We paint the gap before some paragraphs that are indented with left
     // margin/padding, but not others.  We should make the gap painting more
     // consistent and then use a left margin/padding rule here.
-    if (visibleEnd.deepEquivalent() != visibleStart.deepEquivalent() && isStartOfParagraph(visibleEnd)) {
+    if (visibleEnd.deepEquivalent() != visibleStart.deepEquivalent() && isStartOfParagraphDeprecated(visibleEnd)) {
         VisibleSelection newSelection(visibleStart, previousPositionOf(visibleEnd, CannotCrossEditingBoundary), endingSelection().isDirectional());
         if (newSelection.isNone())
             return;
         setEndingSelection(newSelection);
     }
 
     VisibleSelection selection = selectionForParagraphIteration(endingSelection());
     VisiblePosition startOfSelection = selection.visibleStart();
     VisiblePosition endOfSelection = selection.visibleEnd();
     DCHECK(!startOfSelection.isNull());
@@ skipping 38 matching lines @@
             return;
         HTMLBRElement* placeholder = HTMLBRElement::create(document());
         appendNode(placeholder, blockquote, editingState);
         if (editingState->isAborted())
             return;
         setEndingSelection(VisibleSelection(Position::beforeNode(placeholder), TextAffinity::Downstream, endingSelection().isDirectional()));
         return;
     }
 
     HTMLElement* blockquoteForNextIndent = nullptr;
-    VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection);
-    VisiblePosition endOfLastParagraph = endOfParagraph(endOfSelection);
-    VisiblePosition endAfterSelection = endOfParagraph(nextPositionOf(endOfLastParagraph));
+    VisiblePosition endOfCurrentParagraph = endOfParagraphDeprecated(startOfSelection);
+    VisiblePosition endOfLastParagraph = endOfParagraphDeprecated(endOfSelection);
+    VisiblePosition endAfterSelection = endOfParagraphDeprecated(nextPositionOf(endOfLastParagraph));
     m_endOfLastParagraph = endOfLastParagraph.deepEquivalent();
 
     bool atEnd = false;
     Position end;
     while (endOfCurrentParagraph.deepEquivalent() != endAfterSelection.deepEquivalent() && !atEnd) {
         if (endOfCurrentParagraph.deepEquivalent() == m_endOfLastParagraph)
             atEnd = true;
 
         rangeForParagraphSplittingTextNodesIfNeeded(endOfCurrentParagraph, start, end);
         endOfCurrentParagraph = createVisiblePositionDeprecated(end);
@@ skipping 40 matching lines @@
 
 static const ComputedStyle* computedStyleOfEnclosingTextNode(const Position& position)
 {
     if (!position.isOffsetInAnchor() || !position.computeContainerNode() || !position.computeContainerNode()->isTextNode())
         return 0;
     return position.computeContainerNode()->computedStyle();
 }
 
 void ApplyBlockElementCommand::rangeForParagraphSplittingTextNodesIfNeeded(const VisiblePosition& endOfCurrentParagraph, Position& start, Position& end)
 {
-    start = startOfParagraph(endOfCurrentParagraph).deepEquivalent();
+    start = startOfParagraphDeprecated(endOfCurrentParagraph).deepEquivalent();
     end = endOfCurrentParagraph.deepEquivalent();
 
     document().updateStyleAndLayoutTree();
 
     bool isStartAndEndOnSameNode = false;
     if (const ComputedStyle* startStyle = computedStyleOfEnclosingTextNode(start)) {
         isStartAndEndOnSameNode = computedStyleOfEnclosingTextNode(end) && start.computeContainerNode() == end.computeContainerNode();
         bool isStartAndEndOfLastParagraphOnSameNode = computedStyleOfEnclosingTextNode(m_endOfLastParagraph) && start.computeContainerNode() == m_endOfLastParagraph.computeContainerNode();
 
         // Avoid obtanining the start of next paragraph for start
         // TODO(yosin) We should use |PositionMoveType::CodePoint| for
         // |previousPositionOf()|.
         if (startStyle->preserveNewline() && isNewLineAtPosition(start) && !isNewLineAtPosition(previousPositionOf(start, PositionMoveType::CodeUnit)) && start.offsetInContainerNode() > 0)
-            start = startOfParagraph(createVisiblePositionDeprecated(previousPositionOf(end, PositionMoveType::CodeUnit))).deepEquivalent();
+            start = startOfParagraphDeprecated(createVisiblePositionDeprecated(previousPositionOf(end, PositionMoveType::CodeUnit))).deepEquivalent();
 
         // If start is in the middle of a text node, split.
         if (!startStyle->collapseWhiteSpace() && start.offsetInContainerNode() > 0) {
             int startOffset = start.offsetInContainerNode();
             Text* startText = toText(start.computeContainerNode());
             splitTextNode(startText, startOffset);
             start = Position::firstPositionInNode(startText);
             if (isStartAndEndOnSameNode) {
                 DCHECK_GE(end.offsetInContainerNode(), startOffset);
                 end = Position(startText, end.offsetInContainerNode() - startOffset);
@@ skipping 32 matching lines @@
                 else
                     m_endOfLastParagraph = Position(endContainer, m_endOfLastParagraph.offsetInContainerNode() - end.offsetInContainerNode());
             }
             end = Position::lastPositionInNode(endContainer->previousSibling());
         }
     }
 }
 
 VisiblePosition ApplyBlockElementCommand::endOfNextParagrahSplittingTextNodesIfNeeded(VisiblePosition& endOfCurrentParagraph, Position& start, Position& end)
 {
-    VisiblePosition endOfNextParagraph = endOfParagraph(nextPositionOf(endOfCurrentParagraph));
+    VisiblePosition endOfNextParagraph = endOfParagraphDeprecated(nextPositionOf(endOfCurrentParagraph));
     Position position = endOfNextParagraph.deepEquivalent();
     const ComputedStyle* style = computedStyleOfEnclosingTextNode(position);
     if (!style)
         return endOfNextParagraph;
 
     Text* text = toText(position.computeContainerNode());
     if (!style->preserveNewline() || !position.offsetInContainerNode() || !isNewLineAtPosition(Position::firstPositionInNode(text)))
         return endOfNextParagraph;
 
     // \n at the beginning of the text node immediately following the current paragraph is trimmed by moveParagraphWithClones.
@@ skipping 31 matching lines @@
     return element;
 }
 
 DEFINE_TRACE(ApplyBlockElementCommand)
 {
     visitor->trace(m_endOfLastParagraph);
     CompositeEditCommand::trace(visitor);
 }
 
 } // namespace blink