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

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

Issue 1307803003: Introduce nextPositionOf() for VisiblePosition (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-28T18:13:02 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/VisiblePosition.h ('k') | Source/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/VisiblePosition.cpp
diff --git a/Source/core/editing/VisiblePosition.cpp b/Source/core/editing/VisiblePosition.cpp
index 6c12510824762048ab9ccf263980a62bd449f90c..59df76fceb60cea334cb9cd79c5024bc8390199d 100644
--- a/Source/core/editing/VisiblePosition.cpp
+++ b/Source/core/editing/VisiblePosition.cpp
@@ -64,20 +64,21 @@ VisiblePosition::VisiblePosition(const PositionWithAffinity& positionWithAffinit
init(positionWithAffinity.position(), positionWithAffinity.affinity());
}
-VisiblePosition VisiblePosition::next(EditingBoundaryCrossingRule rule) const
+// TODO(yosin) We should move |nextPositionOf()| to "VisibleUnits.cpp".
+VisiblePosition nextPositionOf(const VisiblePosition& visiblePosition, EditingBoundaryCrossingRule rule)
{
- VisiblePosition next(nextVisuallyDistinctCandidate(m_deepPosition), m_affinity);
+ VisiblePosition next(nextVisuallyDistinctCandidate(visiblePosition.deepEquivalent()), visiblePosition.affinity());
switch (rule) {
case CanCrossEditingBoundary:
return next;
case CannotCrossEditingBoundary:
- return honorEditingBoundaryAtOrAfter(next);
+ return visiblePosition.honorEditingBoundaryAtOrAfter(next);
case CanSkipOverEditingBoundary:
- return skipToEndOfEditingBoundary(next);
+ return visiblePosition.skipToEndOfEditingBoundary(next);
}
ASSERT_NOT_REACHED();
- return honorEditingBoundaryAtOrAfter(next);
+ return visiblePosition.honorEditingBoundaryAtOrAfter(next);
}
VisiblePosition previousPositionOf(const VisiblePosition& visiblePosition, EditingBoundaryCrossingRule rule)
« no previous file with comments | « Source/core/editing/VisiblePosition.h ('k') | Source/core/editing/VisibleSelection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698