Commit 741bea9a authored by yoichio@chromium.org's avatar yoichio@chromium.org

[Editing] Modify mostForward/BackwardCaretPosition naming confusion.

mostForwardCaretPosition returns a most backward position and
mostBakwardCaretPosition returns a most forward position.
This is opposite meaning each other.

This CL fixes that.

BUG=518738

Review URL: https://codereview.chromium.org/1310433004

git-svn-id: svn://svn.chromium.org/blink/trunk@200976 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 9baa3762
...@@ -449,13 +449,13 @@ bool PositionAlgorithm<Strategy>::atEndOfTree() const ...@@ -449,13 +449,13 @@ bool PositionAlgorithm<Strategy>::atEndOfTree() const
template <typename Strategy> template <typename Strategy>
PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::upstream(EditingBoundaryCrossingRule rule) const PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::upstream(EditingBoundaryCrossingRule rule) const
{ {
return mostForwardCaretPosition(*this, rule); return mostBackwardCaretPosition(*this, rule);
} }
template <typename Strategy> template <typename Strategy>
PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::downstream(EditingBoundaryCrossingRule rule) const PositionAlgorithm<Strategy> PositionAlgorithm<Strategy>::downstream(EditingBoundaryCrossingRule rule) const
{ {
return mostBackwardCaretPosition(*this, rule); return mostForwardCaretPosition(*this, rule);
} }
template <typename Strategy> template <typename Strategy>
......
...@@ -1954,7 +1954,7 @@ static bool isStreamer(const PositionIteratorAlgorithm<Strategy>& pos) ...@@ -1954,7 +1954,7 @@ static bool isStreamer(const PositionIteratorAlgorithm<Strategy>& pos)
} }
template <typename Strategy> template <typename Strategy>
static PositionAlgorithm<Strategy> mostForwardCaretPosition(const PositionAlgorithm<Strategy>& position, EditingBoundaryCrossingRule rule) static PositionAlgorithm<Strategy> mostBackwardCaretPosition(const PositionAlgorithm<Strategy>& position, EditingBoundaryCrossingRule rule)
{ {
TRACE_EVENT0("blink", "Position::upstream"); TRACE_EVENT0("blink", "Position::upstream");
...@@ -2070,18 +2070,18 @@ static PositionAlgorithm<Strategy> mostForwardCaretPosition(const PositionAlgori ...@@ -2070,18 +2070,18 @@ static PositionAlgorithm<Strategy> mostForwardCaretPosition(const PositionAlgori
return lastVisible.deprecatedComputePosition(); return lastVisible.deprecatedComputePosition();
} }
Position mostForwardCaretPosition(const Position& position, EditingBoundaryCrossingRule rule) Position mostBackwardCaretPosition(const Position& position, EditingBoundaryCrossingRule rule)
{ {
return mostForwardCaretPosition<EditingStrategy>(position, rule); return mostBackwardCaretPosition<EditingStrategy>(position, rule);
} }
PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree& position, EditingBoundaryCrossingRule rule) PositionInComposedTree mostBackwardCaretPosition(const PositionInComposedTree& position, EditingBoundaryCrossingRule rule)
{ {
return mostForwardCaretPosition<EditingInComposedTreeStrategy>(position, rule); return mostBackwardCaretPosition<EditingInComposedTreeStrategy>(position, rule);
} }
template <typename Strategy> template <typename Strategy>
PositionAlgorithm<Strategy> mostBackwardCaretPosition(const PositionAlgorithm<Strategy>& position, EditingBoundaryCrossingRule rule) PositionAlgorithm<Strategy> mostForwardCaretPosition(const PositionAlgorithm<Strategy>& position, EditingBoundaryCrossingRule rule)
{ {
TRACE_EVENT0("blink", "Position::downstream"); TRACE_EVENT0("blink", "Position::downstream");
...@@ -2199,14 +2199,14 @@ PositionAlgorithm<Strategy> mostBackwardCaretPosition(const PositionAlgorithm<St ...@@ -2199,14 +2199,14 @@ PositionAlgorithm<Strategy> mostBackwardCaretPosition(const PositionAlgorithm<St
return lastVisible.deprecatedComputePosition(); return lastVisible.deprecatedComputePosition();
} }
Position mostBackwardCaretPosition(const Position& position, EditingBoundaryCrossingRule rule) Position mostForwardCaretPosition(const Position& position, EditingBoundaryCrossingRule rule)
{ {
return mostBackwardCaretPosition<EditingStrategy>(position, rule); return mostForwardCaretPosition<EditingStrategy>(position, rule);
} }
PositionInComposedTree mostBackwardCaretPosition(const PositionInComposedTree& position, EditingBoundaryCrossingRule rule) PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree& position, EditingBoundaryCrossingRule rule)
{ {
return mostBackwardCaretPosition<EditingInComposedTreeStrategy>(position, rule); return mostForwardCaretPosition<EditingInComposedTreeStrategy>(position, rule);
} }
// Returns true if the visually equivalent positions around have different // Returns true if the visually equivalent positions around have different
......
...@@ -66,21 +66,21 @@ struct InlineBoxPosition { ...@@ -66,21 +66,21 @@ struct InlineBoxPosition {
// collapsible, there are two candidates that map to the VisiblePosition // collapsible, there are two candidates that map to the VisiblePosition
// between 'b' and the space, after first space and before last space. // between 'b' and the space, after first space and before last space.
// //
// mostForwardCaretPosition returns the left candidate and also returs // mostBackwardCaretPosition returns the left candidate and also returs
// [boundary, 0] for any of the positions from [boundary, 0] to the first // [boundary, 0] for any of the positions from [boundary, 0] to the first
// candidate in boundary, where // candidate in boundary, where
// endsOfNodeAreVisuallyDistinctPositions(boundary) is true. // endsOfNodeAreVisuallyDistinctPositions(boundary) is true.
// //
// mostBackwardCaretPosition() returns the right one and also returns the // mostForwardCaretPosition() returns the right one and also returns the
// last position in the last atomic node in boundary for all of the positions // last position in the last atomic node in boundary for all of the positions
// in boundary after the last candidate, where // in boundary after the last candidate, where
// endsOfNodeAreVisuallyDistinctPositions(boundary). // endsOfNodeAreVisuallyDistinctPositions(boundary).
// FIXME: This function should never be called when the line box tree is dirty. // FIXME: This function should never be called when the line box tree is dirty.
// See https://bugs.webkit.org/show_bug.cgi?id=97264 // See https://bugs.webkit.org/show_bug.cgi?id=97264
CORE_EXPORT Position mostForwardCaretPosition(const Position &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT Position mostBackwardCaretPosition(const Position &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); CORE_EXPORT Position mostBackwardCaretPosition(const Position &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostBackwardCaretPosition(const PositionInComposedTree &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary); CORE_EXPORT PositionInComposedTree mostBackwardCaretPosition(const PositionInComposedTree &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT Position mostForwardCaretPosition(const Position &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree &, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
CORE_EXPORT bool isVisuallyEquivalentCandidate(const Position&); CORE_EXPORT bool isVisuallyEquivalentCandidate(const Position&);
CORE_EXPORT bool isVisuallyEquivalentCandidate(const PositionInComposedTree&); CORE_EXPORT bool isVisuallyEquivalentCandidate(const PositionInComposedTree&);
......
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