Mark paragraph-related functions deprecated in VisibleUnits

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

 /*
  * Copyright (C) 2005, 2006, 2008, 2009 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 253 matching lines @@
 
     // Save and restore the selection endpoints using their indices in the document, since
     // addBlockStyleIfNeeded may moveParagraphs, which can remove these endpoints.
     // Calculate start and end indices from the start of the tree that they're in.
     Node& scope = NodeTraversal::highestAncestorOrSelf(*visibleStart.deepEquivalent().anchorNode());
     Range* startRange = Range::create(document(), Position::firstPositionInNode(&scope), visibleStart.deepEquivalent().parentAnchoredEquivalent());
     Range* endRange = Range::create(document(), Position::firstPositionInNode(&scope), visibleEnd.deepEquivalent().parentAnchoredEquivalent());
     int startIndex = TextIterator::rangeLength(startRange->startPosition(), startRange->endPosition(), true);
     int endIndex = TextIterator::rangeLength(endRange->startPosition(), endRange->endPosition(), true);
 
-    VisiblePosition paragraphStart(startOfParagraph(visibleStart));
-    VisiblePosition nextParagraphStart(nextPositionOf(endOfParagraph(paragraphStart)));
-    VisiblePosition beyondEnd(nextPositionOf(endOfParagraph(visibleEnd)));
+    VisiblePosition paragraphStart(startOfParagraphDeprecated(visibleStart));
+    VisiblePosition nextParagraphStart(nextPositionOf(endOfParagraphDeprecated(paragraphStart)));
+    VisiblePosition beyondEnd(nextPositionOf(endOfParagraphDeprecated(visibleEnd)));
     while (paragraphStart.isNotNull() && paragraphStart.deepEquivalent() != beyondEnd.deepEquivalent()) {
         DCHECK(!paragraphStart.isOrphan()) << paragraphStart;
         StyleChange styleChange(style, paragraphStart.deepEquivalent());
         if (styleChange.cssStyle().length() || m_removeOnly) {
             Element* block = enclosingBlock(paragraphStart.deepEquivalent().anchorNode());
             const Position& paragraphStartToMove = paragraphStart.deepEquivalent();
             if (!m_removeOnly && isEditablePosition(paragraphStartToMove)) {
                 HTMLElement* newBlock = moveParagraphContentsToNewBlockIfNecessary(paragraphStartToMove, editingState);
                 if (editingState->isAborted())
                     return;
@@ skipping 10 matching lines @@
                     return;
                 DCHECK(!paragraphStart.isOrphan()) << paragraphStart;
                 if (!m_removeOnly) {
                     addBlockStyle(styleChange, toHTMLElement(block));
                     DCHECK(!paragraphStart.isOrphan()) << paragraphStart;
                 }
             }
 
             DCHECK(!paragraphStart.isOrphan()) << paragraphStart;
             if (nextParagraphStart.isOrphan())
-                nextParagraphStart = nextPositionOf(endOfParagraph(paragraphStart));
+                nextParagraphStart = nextPositionOf(endOfParagraphDeprecated(paragraphStart));
         }
 
         DCHECK(!nextParagraphStart.isOrphan()) << nextParagraphStart;
         paragraphStart = nextParagraphStart;
-        nextParagraphStart = nextPositionOf(endOfParagraph(paragraphStart));
+        nextParagraphStart = nextPositionOf(endOfParagraphDeprecated(paragraphStart));
     }
 
     // Update style and layout again, since added or removed styles could have
     // affected the layout. We need clean layout in order to compute
     // plain-text ranges below.
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
     EphemeralRange startEphemeralRange = PlainTextRange(startIndex).createRangeForSelection(toContainerNode(scope));
     if (startEphemeralRange.isNull())
         return;
@@ skipping 1433 matching lines @@
 DEFINE_TRACE(ApplyStyleCommand)
 {
     visitor->trace(m_style);
     visitor->trace(m_start);
     visitor->trace(m_end);
     visitor->trace(m_styledInlineElement);
     CompositeEditCommand::trace(visitor);
 }
 
 } // namespace blink