Change VisibleUnits::nextBoundary to return Position rather than VisiblePosition

third_party/WebKit/Source/core/editing/VisibleUnits.cpp

 /*
  * Copyright (C) 2004, 2005, 2006, 2007, 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
@@ skipping 889 matching lines @@
 
   // Use the character iterator to translate the next value into a DOM
   // position.
   BackwardsCharacterIteratorAlgorithm<Strategy> charIt(start, end);
   charIt.advance(string.size() - suffixLength - next);
   // TODO(yosin) charIt can get out of shadow host.
   return createVisiblePosition(charIt.endPosition());
 }
 
 template <typename Strategy>
-static VisiblePositionTemplate<Strategy> nextBoundary(
+static PositionTemplate<Strategy> nextBoundary(
     const VisiblePositionTemplate<Strategy>& c,
     BoundarySearchFunction searchFunction) {
   DCHECK(c.isValid()) << c;
   PositionTemplate<Strategy> pos = c.deepEquivalent();
   Node* boundary = parentEditingBoundary(pos);
   if (!boundary)
-    return VisiblePositionTemplate<Strategy>();
+    return PositionTemplate<Strategy>();
 
   Document& d = boundary->document();
   const PositionTemplate<Strategy> start(pos.parentAnchoredEquivalent());
 
   BackwardsTextBuffer prefixString;
   if (requiresContextForWordBoundary(characterAfter(c))) {
     SimplifiedBackwardsTextIteratorAlgorithm<Strategy> backwardsIterator(
         PositionTemplate<Strategy>::firstPositionInNode(&d), start);
     while (!backwardsIterator.atEnd()) {
       backwardsIterator.copyTextTo(&prefixString);
@@ skipping 83 matching lines @@
       const VisiblePositionTemplate<Strategy> visPos =
           createVisiblePosition(pos);
       if (visPos.deepEquivalent() ==
           createVisiblePosition(charIt.startPosition()).deepEquivalent()) {
         charIt.advance(1);
         pos = charIt.startPosition();
       }
     }
   }
 
-  // generate VisiblePosition, use TextAffinity::Upstream affinity if possible
-  return createVisiblePosition(pos, VP_UPSTREAM_IF_POSSIBLE);
+  return pos;
 }
 
 // ---------
 
 static unsigned startWordBoundary(
     const UChar* characters,
     unsigned length,
     unsigned offset,
     BoundarySearchContextAvailability mayHaveMoreContext,
     bool& needMoreContext) {
@@ skipping 67 matching lines @@
     if (isStartOfParagraph(c))
       return c;
 
     p = previousPositionOf(c);
     if (p.isNull())
       return c;
   } else if (isEndOfParagraph(c)) {
     return c;
   }
 
-  return nextBoundary(p, endWordBoundary);
+  return createVisiblePosition(nextBoundary(p, endWordBoundary),
+                               VP_UPSTREAM_IF_POSSIBLE);
 }
 
 VisiblePosition endOfWord(const VisiblePosition& c, EWordSide side) {
   return endOfWordAlgorithm<EditingStrategy>(c, side);
 }
 
 VisiblePositionInFlatTree endOfWord(const VisiblePositionInFlatTree& c,
                                     EWordSide side) {
   return endOfWordAlgorithm<EditingInFlatTreeStrategy>(c, side);
 }
@@ skipping 30 matching lines @@
           static_cast<int>(length - offset)) {
     needMoreContext = true;
     return length;
   }
   needMoreContext = false;
   return findNextWordFromIndex(characters, length, offset, true);
 }
 
 VisiblePosition nextWordPosition(const VisiblePosition& c) {
   DCHECK(c.isValid()) << c;
-  VisiblePosition next = nextBoundary(c, nextWordPositionBoundary);
+  VisiblePosition next = createVisiblePosition(
+      nextBoundary(c, nextWordPositionBoundary), VP_UPSTREAM_IF_POSSIBLE);
   return honorEditingBoundaryAtOrAfter(next, c.deepEquivalent());
 }
 
 // ---------
 
 enum LineEndpointComputationMode { UseLogicalOrdering, UseInlineBoxOrdering };
 template <typename Strategy>
 static PositionWithAffinityTemplate<Strategy> startPositionForLine(
     const PositionWithAffinityTemplate<Strategy>& c,
     LineEndpointComputationMode mode) {
@@ skipping 521 matching lines @@
   TextBreakIterator* iterator = sentenceBreakIterator(characters, length);
   return iterator->next();
 }
 
 // TODO(yosin) This includes the space after the punctuation that marks the end
 // of the sentence.
 template <typename Strategy>
 static VisiblePositionTemplate<Strategy> endOfSentenceAlgorithm(
     const VisiblePositionTemplate<Strategy>& c) {
   DCHECK(c.isValid()) << c;
-  return nextBoundary(c, endSentenceBoundary);
+  return createVisiblePosition(nextBoundary(c, endSentenceBoundary),
+                               VP_UPSTREAM_IF_POSSIBLE);
 }
 
 VisiblePosition endOfSentence(const VisiblePosition& c) {
   return endOfSentenceAlgorithm<EditingStrategy>(c);
 }
 
 VisiblePositionInFlatTree endOfSentence(const VisiblePositionInFlatTree& c) {
   return endOfSentenceAlgorithm<EditingInFlatTreeStrategy>(c);
 }
 
@@ skipping 22 matching lines @@
                                              BoundarySearchContextAvailability,
                                              bool&) {
   // FIXME: This is identical to endSentenceBoundary. This isn't right, it needs
   // to move to the equivlant position in the following sentence.
   TextBreakIterator* iterator = sentenceBreakIterator(characters, length);
   return iterator->following(0);
 }
 
 VisiblePosition nextSentencePosition(const VisiblePosition& c) {
   DCHECK(c.isValid()) << c;
-  VisiblePosition next = nextBoundary(c, nextSentencePositionBoundary);
+  VisiblePosition next = createVisiblePosition(
+      nextBoundary(c, nextSentencePositionBoundary), VP_UPSTREAM_IF_POSSIBLE);
   return honorEditingBoundaryAtOrAfter(next, c.deepEquivalent());
 }
 
 EphemeralRange expandEndToSentenceBoundary(const EphemeralRange& range) {
   DCHECK(range.isNotNull());
   const VisiblePosition& visibleEnd =
       createVisiblePosition(range.endPosition());
   DCHECK(visibleEnd.isNotNull());
   const Position& sentenceEnd = endOfSentence(visibleEnd).deepEquivalent();
   // TODO(xiaochengh): |sentenceEnd < range.endPosition()| is possible,
@@ skipping 2208 matching lines @@
 
 VisiblePositionInFlatTree previousPositionOf(
     const VisiblePositionInFlatTree& visiblePosition,
     EditingBoundaryCrossingRule rule) {
   DCHECK(visiblePosition.isValid()) << visiblePosition;
   return previousPositionOfAlgorithm<EditingInFlatTreeStrategy>(
       visiblePosition.deepEquivalent(), rule);
 }
 
 }  // namespace blink