Get rid of VisiblePosition version of...

Get rid of VisiblePosition version of Adjust{Back,For}warddPositionToAvoidCrossingEditingBoundaries()

This patch gets rid of |VisiblePosition| of
|Adjust{Back,For}warddPositionToAvoidCrossingEditingBoundaries()|
by expanding it at caller, because it is used once, second usages are
not needed, to reduce source code and reduce usage of |VisiblePosition|.

Note: This patch doesn't change behavior.

Bug: 657237
Change-Id: I6e68860c0e1c37a2a4770d99f9bc3c59ff86b4d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2569011
Auto-Submit: Yoshifumi Inoue <yosin@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Commit-Queue: Koji Ishii <kojii@chromium.org>
Commit-Queue: Yoshifumi Inoue <yosin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832703}

third_party/blink/renderer/core/editing/visible_units.cc

@@ -268,32 +268,6 @@ AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
                                                                         anchor);
 }
 
-template <typename Strategy>
-VisiblePositionTemplate<Strategy>
-AdjustBackwardPositionToAvoidCrossingEditingBoundariesAlgorithm(
-    const VisiblePositionTemplate<Strategy>& pos,
-    const PositionTemplate<Strategy>& anchor) {
-  DCHECK(pos.IsValid()) << pos;
-  return CreateVisiblePosition(
-      AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
-          pos.ToPositionWithAffinity(), anchor));
-}
-
-VisiblePosition AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePosition& visiblePosition,
-    const Position& anchor) {
-  return AdjustBackwardPositionToAvoidCrossingEditingBoundariesAlgorithm(
-      visiblePosition, anchor);
-}
-
-VisiblePositionInFlatTree
-AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePositionInFlatTree& visiblePosition,
-    const PositionInFlatTree& anchor) {
-  return AdjustBackwardPositionToAvoidCrossingEditingBoundariesAlgorithm(
-      visiblePosition, anchor);
-}
-
 template <typename Strategy>
 static PositionWithAffinityTemplate<Strategy>
 AdjustForwardPositionToAvoidCrossingEditingBoundariesTemplate(
@@ -352,24 +326,6 @@ AdjustForwardPositionToAvoidCrossingEditingBoundaries(
       PositionInFlatTreeWithAffinity(pos), anchor);
 }
 
-VisiblePosition AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePosition& pos,
-    const Position& anchor) {
-  DCHECK(pos.IsValid()) << pos;
-  return CreateVisiblePosition(
-      AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-          pos.ToPositionWithAffinity(), anchor));
-}
-
-VisiblePositionInFlatTree AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePositionInFlatTree& pos,
-    const PositionInFlatTree& anchor) {
-  DCHECK(pos.IsValid()) << pos;
-  return CreateVisiblePosition(
-      AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-          pos.ToPositionWithAffinity(), anchor));
-}
-
 template <typename Strategy>
 static ContainerNode* NonShadowBoundaryParentNode(Node* node) {
   ContainerNode* parent = Strategy::Parent(*node);
@@ -1133,15 +1089,15 @@ static VisiblePositionTemplate<Strategy> NextPositionOfAlgorithm(
     case kCanCrossEditingBoundary:
       return next;
     case kCannotCrossEditingBoundary:
-      return AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-          next, position.GetPosition());
+      return CreateVisiblePosition(
+          AdjustForwardPositionToAvoidCrossingEditingBoundaries(
+              next.ToPositionWithAffinity(), position.GetPosition()));
     case kCanSkipOverEditingBoundary:
       return CreateVisiblePosition(SkipToEndOfEditingBoundary(
           next.DeepEquivalent(), position.GetPosition()));
   }
   NOTREACHED();
-  return AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-      next, position.GetPosition());
+  return next;
 }
 
 VisiblePosition NextPositionOf(const VisiblePosition& visible_position,
@@ -1212,15 +1168,16 @@ static VisiblePositionTemplate<Strategy> PreviousPositionOfAlgorithm(
     case kCanCrossEditingBoundary:
       return prev;
     case kCannotCrossEditingBoundary:
-      return AdjustBackwardPositionToAvoidCrossingEditingBoundaries(prev,
-                                                                    position);
+      return CreateVisiblePosition(
+          AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
+              prev.ToPositionWithAffinity(), position));
     case kCanSkipOverEditingBoundary:
       return CreateVisiblePosition(
           SkipToStartOfEditingBoundary(prev.DeepEquivalent(), position));
   }
 
   NOTREACHED();
-  return AdjustBackwardPositionToAvoidCrossingEditingBoundaries(prev, position);
+  return prev;
 }
 
 VisiblePosition PreviousPositionOf(const VisiblePosition& visible_position,

third_party/blink/renderer/core/editing/visible_units.h

@@ -285,24 +285,6 @@ AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
     const PositionInFlatTreeWithAffinity&,
     const PositionInFlatTree&);
 
-VisiblePosition AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePosition&,
-    const Position&);
-
-VisiblePositionInFlatTree AdjustForwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePositionInFlatTree&,
-    const PositionInFlatTree&);
-
-// Export below functions only for |SelectionModifier|.
-VisiblePosition AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePosition&,
-    const Position&);
-
-VisiblePositionInFlatTree
-AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
-    const VisiblePositionInFlatTree&,
-    const PositionInFlatTree&);
-
 }  // namespace blink
 
 #endif  // THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_VISIBLE_UNITS_H_