Mark paragraph-related functions deprecated in VisibleUnits

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

 /*
  * Copyright (C) 2006, 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 140 matching lines @@
     }
 
     VisiblePosition endOfContents = createVisiblePositionDeprecated(end);
     if (startOfContents.isNull() || endOfContents.isNull())
         return;
     moveParagraphWithClones(startOfContents, endOfContents, targetBlockquote, outerBlock, editingState);
 }
 
 void IndentOutdentCommand::outdentParagraph(EditingState* editingState)
 {
-    VisiblePosition visibleStartOfParagraph = startOfParagraph(endingSelection().visibleStart());
-    VisiblePosition visibleEndOfParagraph = endOfParagraph(visibleStartOfParagraph);
+    VisiblePosition visibleStartOfParagraph = startOfParagraphDeprecated(endingSelection().visibleStart());
+    VisiblePosition visibleEndOfParagraph = endOfParagraphDeprecated(visibleStartOfParagraph);
 
     HTMLElement* enclosingElement = toHTMLElement(enclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), &isHTMLListOrBlockquoteElement));
     if (!enclosingElement || !hasEditableStyle(*enclosingElement->parentNode())) // We can't outdent if there is no place to go!
         return;
 
     // Use InsertListCommand to remove the selection from the list
     if (isHTMLOListElement(*enclosingElement)) {
         applyCommandToComposite(InsertListCommand::create(document(), InsertListCommand::OrderedList), editingState);
         return;
     }
@@ skipping 23 matching lines @@
                 if (splitPointParent->hasTagName(blockquoteTag)
                     && !splitPoint->hasTagName(blockquoteTag)
                     && hasEditableStyle(*splitPointParent->parentNode())) // We can't outdent if there is no place to go!
                     splitElement(splitPointParent, splitPoint);
             }
         }
 
         document().updateStyleAndLayoutIgnorePendingStylesheets();
         visibleStartOfParagraph = createVisiblePositionDeprecated(visibleStartOfParagraph.deepEquivalent());
         visibleEndOfParagraph = createVisiblePositionDeprecated(visibleEndOfParagraph.deepEquivalent());
-        if (visibleStartOfParagraph.isNotNull() && !isStartOfParagraph(visibleStartOfParagraph)) {
+        if (visibleStartOfParagraph.isNotNull() && !isStartOfParagraphDeprecated(visibleStartOfParagraph)) {
             insertNodeAt(HTMLBRElement::create(document()), visibleStartOfParagraph.deepEquivalent(), editingState);
             if (editingState->isAborted())
                 return;
         }
-        if (visibleEndOfParagraph.isNotNull() && !isEndOfParagraph(visibleEndOfParagraph))
+        if (visibleEndOfParagraph.isNotNull() && !isEndOfParagraphDeprecated(visibleEndOfParagraph))
             insertNodeAt(HTMLBRElement::create(document()), visibleEndOfParagraph.deepEquivalent(), editingState);
         return;
     }
     Node* splitBlockquoteNode = enclosingElement;
     if (Element* enclosingBlockFlow = enclosingBlock(visibleStartOfParagraph.deepEquivalent().anchorNode())) {
         if (enclosingBlockFlow != enclosingElement) {
             splitBlockquoteNode = splitTreeToNode(enclosingBlockFlow, enclosingElement, true);
         } else {
             // We split the blockquote at where we start outdenting.
             Node* highestInlineNode = highestEnclosingNodeOfType(visibleStartOfParagraph.deepEquivalent(), isInline, CannotCrossEditingBoundary, enclosingBlockFlow);
             splitElement(enclosingElement, highestInlineNode ? highestInlineNode : visibleStartOfParagraph.deepEquivalent().anchorNode());
         }
     }
-    VisiblePosition startOfParagraphToMove = startOfParagraph(visibleStartOfParagraph);
-    VisiblePosition endOfParagraphToMove = endOfParagraph(visibleEndOfParagraph);
+    VisiblePosition startOfParagraphToMove = startOfParagraphDeprecated(visibleStartOfParagraph);
+    VisiblePosition endOfParagraphToMove = endOfParagraphDeprecated(visibleEndOfParagraph);
     if (startOfParagraphToMove.isNull() || endOfParagraphToMove.isNull())
         return;
     HTMLBRElement* placeholder = HTMLBRElement::create(document());
     insertNodeBefore(placeholder, splitBlockquoteNode, editingState);
     if (editingState->isAborted())
         return;
     moveParagraph(startOfParagraphToMove, endOfParagraphToMove, VisiblePosition::beforeNode(placeholder), editingState, PreserveSelection);
 }
 
 // FIXME: We should merge this function with ApplyBlockElementCommand::formatSelection
 void IndentOutdentCommand::outdentRegion(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection, EditingState* editingState)
 {
-    VisiblePosition endOfCurrentParagraph = endOfParagraph(startOfSelection);
-    VisiblePosition endOfLastParagraph = endOfParagraph(endOfSelection);
+    VisiblePosition endOfCurrentParagraph = endOfParagraphDeprecated(startOfSelection);
+    VisiblePosition endOfLastParagraph = endOfParagraphDeprecated(endOfSelection);
 
     if (endOfCurrentParagraph.deepEquivalent() == endOfLastParagraph.deepEquivalent()) {
         outdentParagraph(editingState);
         return;
     }
 
     Position originalSelectionEnd = endingSelection().end();
-    VisiblePosition endAfterSelection = endOfParagraph(nextPositionOf(endOfLastParagraph));
+    VisiblePosition endAfterSelection = endOfParagraphDeprecated(nextPositionOf(endOfLastParagraph));
 
     while (endOfCurrentParagraph.deepEquivalent() != endAfterSelection.deepEquivalent()) {
-        VisiblePosition endOfNextParagraph = endOfParagraph(nextPositionOf(endOfCurrentParagraph));
+        VisiblePosition endOfNextParagraph = endOfParagraphDeprecated(nextPositionOf(endOfCurrentParagraph));
         if (endOfCurrentParagraph.deepEquivalent() == endOfLastParagraph.deepEquivalent())
             setEndingSelection(VisibleSelection(originalSelectionEnd, TextAffinity::Downstream));
         else
             setEndingSelection(endOfCurrentParagraph);
 
         outdentParagraph(editingState);
         if (editingState->isAborted())
             return;
 
         // outdentParagraph could move more than one paragraph if the paragraph
         // is in a list item. As a result, endAfterSelection and endOfNextParagraph
         // could refer to positions no longer in the document.
         if (endAfterSelection.isNotNull() && !endAfterSelection.deepEquivalent().isConnected())
             break;
 
         if (endOfNextParagraph.isNotNull() && !endOfNextParagraph.deepEquivalent().isConnected()) {
             endOfCurrentParagraph = createVisiblePositionDeprecated(endingSelection().end());
-            endOfNextParagraph = endOfParagraph(nextPositionOf(endOfCurrentParagraph));
+            endOfNextParagraph = endOfParagraphDeprecated(nextPositionOf(endOfCurrentParagraph));
         }
         endOfCurrentParagraph = endOfNextParagraph;
     }
 }
 
 void IndentOutdentCommand::formatSelection(const VisiblePosition& startOfSelection, const VisiblePosition& endOfSelection, EditingState* editingState)
 {
     if (m_typeOfAction == Indent)
         ApplyBlockElementCommand::formatSelection(startOfSelection, endOfSelection, editingState);
     else
@@ skipping 10 matching lines @@
     else
         indentIntoBlockquote(start, end, blockquoteForNextIndent, editingState);
 }
 
 InputEvent::InputType IndentOutdentCommand::inputType() const
 {
     return m_typeOfAction == Indent ? InputEvent::InputType::Indent : InputEvent::InputType::Outdent;
 }
 
 } // namespace blink