Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream}

Source/core/editing/EditingUtilities.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007 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 348 matching lines @@
 
 // |nextVisuallyDistinctCandidate| is similar to |nextCandidate| except
 // for returning position which |downstream()| not equal to initial position's
 // |downstream()|.
 Position nextVisuallyDistinctCandidate(const Position& position)
 {
     if (position.isNull())
         return Position();
 
     PositionIterator p(position);
-    Position downstreamStart = position.downstream();
+    Position downstreamStart = mostForwardCaretPosition(position);
 
     p.increment();
     while (!p.atEnd()) {
         Position candidate = p.computePosition();
-        if (isVisuallyEquivalentCandidate(candidate) && candidate.downstream() != downstreamStart)
+        if (isVisuallyEquivalentCandidate(candidate) && mostForwardCaretPosition(candidate) != downstreamStart)
             return candidate;
 
         p.increment();
     }
 
     return Position();
 }
 
 template <typename Strategy>
 PositionAlgorithm<Strategy> previousCandidateAlgorithm(const PositionAlgorithm<Strategy>& position)
@@ skipping 25 matching lines @@
 // |previousVisuallyDistinctCandidate| is similar to |previousCandidate| except
 // for returning position which |downstream()| not equal to initial position's
 // |downstream()|.
 template <typename Strategy>
 PositionAlgorithm<Strategy> previousVisuallyDistinctCandidateAlgorithm(const PositionAlgorithm<Strategy>& position)
 {
     if (position.isNull())
         return PositionAlgorithm<Strategy>();
 
     PositionIteratorAlgorithm<Strategy> p(position);
-    PositionAlgorithm<Strategy> downstreamStart = position.downstream();
+    PositionAlgorithm<Strategy> downstreamStart = mostForwardCaretPosition(position);
 
     p.decrement();
     while (!p.atStart()) {
         PositionAlgorithm<Strategy> candidate = p.computePosition();
-        if (isVisuallyEquivalentCandidate(candidate) && candidate.downstream() != downstreamStart)
+        if (isVisuallyEquivalentCandidate(candidate) && mostForwardCaretPosition(candidate) != downstreamStart)
             return candidate;
 
         p.decrement();
     }
 
     return PositionAlgorithm<Strategy>();
 }
 
 Position previousVisuallyDistinctCandidate(const Position& position)
 {
@@ skipping 261 matching lines @@
     Position result = positionInParentAfterNode(*n);
     if (result.isNull() || result.anchorNode()->rootEditableElement() != pos.anchorNode()->rootEditableElement())
         return pos;
     if (containingSpecialElement)
         *containingSpecialElement = n;
     return result;
 }
 
 Element* isFirstPositionAfterTable(const VisiblePosition& visiblePosition)
 {
-    Position upstream(visiblePosition.deepEquivalent().upstream());
+    Position upstream(mostBackwardCaretPosition(visiblePosition.deepEquivalent()));
     if (isRenderedTableElement(upstream.anchorNode()) && upstream.atLastEditingPositionForNode())
         return toElement(upstream.anchorNode());
 
     return 0;
 }
 
 Element* isLastPositionBeforeTable(const VisiblePosition& visiblePosition)
 {
-    Position downstream(visiblePosition.deepEquivalent().downstream());
+    Position downstream(mostForwardCaretPosition(visiblePosition.deepEquivalent()));
     if (isRenderedTableElement(downstream.anchorNode()) && downstream.atFirstEditingPositionForNode())
         return toElement(downstream.anchorNode());
 
     return 0;
 }
 
 static Node* previousNodeConsideringAtomicNodes(const Node& start)
 {
     if (start.previousSibling()) {
         Node* node = start.previousSibling();
@@ skipping 246 matching lines @@
         list = nextList;
     }
 
     return list;
 }
 
 // Determines whether two positions are visibly next to each other (first then second)
 // while ignoring whitespaces and unrendered nodes
 static bool isVisiblyAdjacent(const Position& first, const Position& second)
 {
-    return VisiblePosition(first).deepEquivalent() == VisiblePosition(second.upstream()).deepEquivalent();
+    return VisiblePosition(first).deepEquivalent() == VisiblePosition(mostBackwardCaretPosition(second)).deepEquivalent();
 }
 
 bool canMergeLists(Element* firstList, Element* secondList)
 {
     if (!firstList || !secondList || !firstList->isHTMLElement() || !secondList->isHTMLElement())
         return false;
 
     return firstList->hasTagName(secondList->tagQName()) // make sure the list types match (ol vs. ul)
     && firstList->hasEditableStyle() && secondList->hasEditableStyle() // both lists are editable
     && firstList->rootEditableElement() == secondList->rootEditableElement() // don't cross editing boundaries
@@ skipping 180 matching lines @@
     return position;
 }
 
 // This assumes that it starts in editable content.
 Position leadingWhitespacePosition(const Position& position, TextAffinity affinity, WhitespacePositionOption option)
 {
     ASSERT(isEditablePosition(position, ContentIsEditable, DoNotUpdateStyle));
     if (position.isNull())
         return Position();
 
-    if (isHTMLBRElement(*position.upstream().anchorNode()))
+    if (isHTMLBRElement(*mostBackwardCaretPosition(position).anchorNode()))
         return Position();
 
     Position prev = previousCharacterPosition(position, affinity);
     if (prev != position && inSameContainingBlockFlowElement(prev.anchorNode(), position.anchorNode()) && prev.anchorNode()->isTextNode()) {
         String string = toText(prev.anchorNode())->data();
         UChar previousCharacter = string[prev.computeOffsetInContainerNode()];
         bool isSpace = option == ConsiderNonCollapsibleWhitespace ? (isSpaceOrNewline(previousCharacter) || previousCharacter == noBreakSpaceCharacter) : isCollapsibleWhitespace(previousCharacter);
         if (isSpace && isEditablePosition(prev))
             return prev;
     }
@@ skipping 73 matching lines @@
     return r ? r->caretMinOffset() : 0;
 }
 
 int caretMaxOffset(const Node* n)
 {
     return EditingStrategy::caretMaxOffset(*n);
 }
 
 bool lineBreakExistsAtVisiblePosition(const VisiblePosition& visiblePosition)
 {
-    return lineBreakExistsAtPosition(visiblePosition.deepEquivalent().downstream());
+    return lineBreakExistsAtPosition(mostForwardCaretPosition(visiblePosition.deepEquivalent()));
 }
 
 bool lineBreakExistsAtPosition(const Position& position)
 {
     if (position.isNull())
         return false;
 
     if (isHTMLBRElement(*position.anchorNode()) && position.atFirstEditingPositionForNode())
         return true;
 
@@ skipping 151 matching lines @@
     if (visiblePosition.isNull())
         return Position();
 
     // if the selection is a caret, just return the position, since the style
     // behind us is relevant
     if (selection.isCaret())
         return visiblePosition.deepEquivalent();
 
     // if the selection starts just before a paragraph break, skip over it
     if (isEndOfParagraph(visiblePosition))
-        return visiblePosition.next().deepEquivalent().downstream();
+        return mostForwardCaretPosition(visiblePosition.next().deepEquivalent());
 
     // otherwise, make sure to be at the start of the first selected node,
     // instead of possibly at the end of the last node before the selection
-    return visiblePosition.deepEquivalent().downstream();
+    return mostForwardCaretPosition(visiblePosition.deepEquivalent());
 }
 
 } // namespace blink