Commit 222a5298 authored by Yoshifumi Inoue's avatar Yoshifumi Inoue Committed by Chromium LUCI CQ

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: default avatarKoji 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}
parent a08daf92
...@@ -268,32 +268,6 @@ AdjustBackwardPositionToAvoidCrossingEditingBoundaries( ...@@ -268,32 +268,6 @@ AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
anchor); 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> template <typename Strategy>
static PositionWithAffinityTemplate<Strategy> static PositionWithAffinityTemplate<Strategy>
AdjustForwardPositionToAvoidCrossingEditingBoundariesTemplate( AdjustForwardPositionToAvoidCrossingEditingBoundariesTemplate(
...@@ -352,24 +326,6 @@ AdjustForwardPositionToAvoidCrossingEditingBoundaries( ...@@ -352,24 +326,6 @@ AdjustForwardPositionToAvoidCrossingEditingBoundaries(
PositionInFlatTreeWithAffinity(pos), anchor); 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> template <typename Strategy>
static ContainerNode* NonShadowBoundaryParentNode(Node* node) { static ContainerNode* NonShadowBoundaryParentNode(Node* node) {
ContainerNode* parent = Strategy::Parent(*node); ContainerNode* parent = Strategy::Parent(*node);
...@@ -1133,15 +1089,15 @@ static VisiblePositionTemplate<Strategy> NextPositionOfAlgorithm( ...@@ -1133,15 +1089,15 @@ static VisiblePositionTemplate<Strategy> NextPositionOfAlgorithm(
case kCanCrossEditingBoundary: case kCanCrossEditingBoundary:
return next; return next;
case kCannotCrossEditingBoundary: case kCannotCrossEditingBoundary:
return AdjustForwardPositionToAvoidCrossingEditingBoundaries( return CreateVisiblePosition(
next, position.GetPosition()); AdjustForwardPositionToAvoidCrossingEditingBoundaries(
next.ToPositionWithAffinity(), position.GetPosition()));
case kCanSkipOverEditingBoundary: case kCanSkipOverEditingBoundary:
return CreateVisiblePosition(SkipToEndOfEditingBoundary( return CreateVisiblePosition(SkipToEndOfEditingBoundary(
next.DeepEquivalent(), position.GetPosition())); next.DeepEquivalent(), position.GetPosition()));
} }
NOTREACHED(); NOTREACHED();
return AdjustForwardPositionToAvoidCrossingEditingBoundaries( return next;
next, position.GetPosition());
} }
VisiblePosition NextPositionOf(const VisiblePosition& visible_position, VisiblePosition NextPositionOf(const VisiblePosition& visible_position,
...@@ -1212,15 +1168,16 @@ static VisiblePositionTemplate<Strategy> PreviousPositionOfAlgorithm( ...@@ -1212,15 +1168,16 @@ static VisiblePositionTemplate<Strategy> PreviousPositionOfAlgorithm(
case kCanCrossEditingBoundary: case kCanCrossEditingBoundary:
return prev; return prev;
case kCannotCrossEditingBoundary: case kCannotCrossEditingBoundary:
return AdjustBackwardPositionToAvoidCrossingEditingBoundaries(prev, return CreateVisiblePosition(
position); AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
prev.ToPositionWithAffinity(), position));
case kCanSkipOverEditingBoundary: case kCanSkipOverEditingBoundary:
return CreateVisiblePosition( return CreateVisiblePosition(
SkipToStartOfEditingBoundary(prev.DeepEquivalent(), position)); SkipToStartOfEditingBoundary(prev.DeepEquivalent(), position));
} }
NOTREACHED(); NOTREACHED();
return AdjustBackwardPositionToAvoidCrossingEditingBoundaries(prev, position); return prev;
} }
VisiblePosition PreviousPositionOf(const VisiblePosition& visible_position, VisiblePosition PreviousPositionOf(const VisiblePosition& visible_position,
......
...@@ -285,24 +285,6 @@ AdjustBackwardPositionToAvoidCrossingEditingBoundaries( ...@@ -285,24 +285,6 @@ AdjustBackwardPositionToAvoidCrossingEditingBoundaries(
const PositionInFlatTreeWithAffinity&, const PositionInFlatTreeWithAffinity&,
const PositionInFlatTree&); 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 } // namespace blink
#endif // THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_VISIBLE_UNITS_H_ #endif // THIRD_PARTY_BLINK_RENDERER_CORE_EDITING_VISIBLE_UNITS_H_
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment