Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(904)

Unified Diff: Source/core/editing/VisibleUnits.cpp

Issue 1302353002: Get rid of redundant member function PositionAlgorithm<Strategy>::{upstream,downstream} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-22T04:51:20 Rebase Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/editing/VisibleSelection.cpp ('k') | Source/core/editing/VisibleUnitsTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/VisibleUnits.cpp
diff --git a/Source/core/editing/VisibleUnits.cpp b/Source/core/editing/VisibleUnits.cpp
index 7a4d9e97250d156508207aeb8e7b8349f301ee3a..80cdc9c240d8dfcca6d1597775a465481da287b8 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -1500,7 +1500,7 @@ PositionAlgorithm<Strategy> downstreamIgnoringEditingBoundaries(PositionAlgorith
PositionAlgorithm<Strategy> lastPosition;
while (position != lastPosition) {
lastPosition = position;
- position = position.downstream(CanCrossEditingBoundary);
+ position = mostForwardCaretPosition(position, CanCrossEditingBoundary);
}
return position;
}
@@ -1511,7 +1511,7 @@ PositionAlgorithm<Strategy> upstreamIgnoringEditingBoundaries(PositionAlgorithm<
PositionAlgorithm<Strategy> lastPosition;
while (position != lastPosition) {
lastPosition = position;
- position = position.upstream(CanCrossEditingBoundary);
+ position = mostBackwardCaretPosition(position, CanCrossEditingBoundary);
}
return position;
}
@@ -2250,11 +2250,11 @@ PositionInComposedTree mostForwardCaretPosition(const PositionInComposedTree& po
template <typename Strategy>
static bool atEditingBoundary(const PositionAlgorithm<Strategy> positions)
{
- PositionAlgorithm<Strategy> nextPosition = positions.downstream(CanCrossEditingBoundary);
+ PositionAlgorithm<Strategy> nextPosition = mostForwardCaretPosition(positions, CanCrossEditingBoundary);
if (positions.atFirstEditingPositionForNode() && nextPosition.isNotNull() && !nextPosition.anchorNode()->hasEditableStyle())
return true;
- PositionAlgorithm<Strategy> prevPosition = positions.upstream(CanCrossEditingBoundary);
+ PositionAlgorithm<Strategy> prevPosition = mostBackwardCaretPosition(positions, CanCrossEditingBoundary);
if (positions.atLastEditingPositionForNode() && prevPosition.isNotNull() && !prevPosition.anchorNode()->hasEditableStyle())
return true;
« no previous file with comments | « Source/core/editing/VisibleSelection.cpp ('k') | Source/core/editing/VisibleUnitsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698