Add VisibleUnits::endfWordPosition

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 1072 matching lines @@
       endOfFirstWordBoundaryContext(characters + offset, length - offset) ==
           static_cast<int>(length - offset)) {
     needMoreContext = true;
     return length;
   }
   needMoreContext = false;
   return findWordEndBoundary(characters, length, offset);
 }
 
 template <typename Strategy>
-static VisiblePositionTemplate<Strategy> endOfWordAlgorithm(
+static PositionTemplate<Strategy> endOfWordAlgorithm(
     const VisiblePositionTemplate<Strategy>& c,
     EWordSide side) {
   DCHECK(c.isValid()) << c;
   VisiblePositionTemplate<Strategy> p = c;
   if (side == LeftWordIfOnBoundary) {
     if (isStartOfParagraph(c))
-      return c;
+      return c.deepEquivalent();
 
     p = previousPositionOf(c);
     if (p.isNull())
-      return c;
+      return c.deepEquivalent();
   } else if (isEndOfParagraph(c)) {
-    return c;
+    return c.deepEquivalent();
   }
 
-  return createVisiblePosition(nextBoundary(p, endWordBoundary),
+  return nextBoundary(p, endWordBoundary);
+}
+
+Position endOfWordPosition(const VisiblePosition& position, EWordSide side) {
+  return endOfWordAlgorithm<EditingStrategy>(position, side);
+}
+
+VisiblePosition endOfWord(const VisiblePosition& position, EWordSide side) {
+  return createVisiblePosition(endOfWordPosition(position, side),
                                VP_UPSTREAM_IF_POSSIBLE);
 }
 
-VisiblePosition endOfWord(const VisiblePosition& c, EWordSide side) {
-  return endOfWordAlgorithm<EditingStrategy>(c, side);
+PositionInFlatTree endOfWordPosition(const VisiblePositionInFlatTree& position,
+                                     EWordSide side) {
+  return endOfWordAlgorithm<EditingInFlatTreeStrategy>(position, side);
 }
 
-VisiblePositionInFlatTree endOfWord(const VisiblePositionInFlatTree& c,
+VisiblePositionInFlatTree endOfWord(const VisiblePositionInFlatTree& position,
                                     EWordSide side) {
-  return endOfWordAlgorithm<EditingInFlatTreeStrategy>(c, side);
+  return createVisiblePosition(endOfWordPosition(position, side),
+                               VP_UPSTREAM_IF_POSSIBLE);
 }
 
 static unsigned previousWordPositionBoundary(
     const UChar* characters,
     unsigned length,
     unsigned offset,
     BoundarySearchContextAvailability mayHaveMoreContext,
     bool& needMoreContext) {
   if (mayHaveMoreContext &&
       !startOfLastWordBoundaryContext(characters, offset)) {
@@ skipping 2846 matching lines @@
 
 VisiblePositionInFlatTree previousPositionOf(
     const VisiblePositionInFlatTree& visiblePosition,
     EditingBoundaryCrossingRule rule) {
   DCHECK(visiblePosition.isValid()) << visiblePosition;
   return previousPositionOfAlgorithm<EditingInFlatTreeStrategy>(
       visiblePosition.deepEquivalent(), rule);
 }
 
 }  // namespace blink