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

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

Issue 1312473017: Introduce composed tree version of previousPositionOf() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-09T15:16:13 Created 5 years, 3 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/VisibleUnits.h ('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 d47628a3e914c6b878f4b571df2fd356ddc85a06..2987ac233fe30a82addd6ec5a65a058c25372908 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -2958,7 +2958,8 @@ VisiblePositionInComposedTree nextPositionOf(const VisiblePositionInComposedTree
return nextPositionOfAlgorithm<EditingInComposedTreeStrategy>(visiblePosition, rule);
}
-static VisiblePosition skipToStartOfEditingBoundary(const VisiblePosition& pos, const Position& anchor)
+template <typename Strategy>
+static VisiblePositionTemplate<Strategy> skipToStartOfEditingBoundary(const VisiblePositionTemplate<Strategy>& pos, const PositionAlgorithm<Strategy>& anchor)
{
if (pos.isNull())
return pos;
@@ -2973,22 +2974,23 @@ static VisiblePosition skipToStartOfEditingBoundary(const VisiblePosition& pos,
// If this is not editable but |pos| has an editable root, skip to the start
if (!highestRoot && highestRootOfPos)
- return createVisiblePosition(previousVisuallyDistinctCandidate(Position(highestRootOfPos, PositionAnchorType::BeforeAnchor).parentAnchoredEquivalent()));
+ return createVisiblePosition(previousVisuallyDistinctCandidate(PositionAlgorithm<Strategy>(highestRootOfPos, PositionAnchorType::BeforeAnchor).parentAnchoredEquivalent()));
// That must mean that |pos| is not editable. Return the last position
// before |pos| that is in the same editable region as this position
return lastEditableVisiblePositionBeforePositionInRoot(pos.deepEquivalent(), highestRoot);
}
-VisiblePosition previousPositionOf(const VisiblePosition& visiblePosition, EditingBoundaryCrossingRule rule)
+template <typename Strategy>
+static VisiblePositionTemplate<Strategy> previousPositionOfAlgorithm(const VisiblePositionTemplate<Strategy>& visiblePosition, EditingBoundaryCrossingRule rule)
{
- Position pos = previousVisuallyDistinctCandidate(visiblePosition.deepEquivalent());
+ const PositionAlgorithm<Strategy> pos = previousVisuallyDistinctCandidate(visiblePosition.deepEquivalent());
// return null visible position if there is no previous visible position
if (pos.atStartOfTree())
- return VisiblePosition();
+ return VisiblePositionTemplate<Strategy>();
- VisiblePosition prev = createVisiblePosition(pos);
+ const VisiblePositionTemplate<Strategy> prev = createVisiblePosition(pos);
ASSERT(prev.deepEquivalent() != visiblePosition.deepEquivalent());
#if ENABLE(ASSERT)
@@ -2997,7 +2999,7 @@ VisiblePosition previousPositionOf(const VisiblePosition& visiblePosition, Editi
// never yield another |TextAffinity::Upstream position| (unless line wrap
// length is 0!).
if (prev.isNotNull() && visiblePosition.affinity() == TextAffinity::Upstream) {
- ASSERT(inSameLine(PositionWithAffinity(prev.deepEquivalent()), PositionWithAffinity(prev.deepEquivalent(), TextAffinity::Upstream)));
+ ASSERT(inSameLine(PositionWithAffinityTemplate<Strategy>(prev.deepEquivalent()), PositionWithAffinityTemplate<Strategy>(prev.deepEquivalent(), TextAffinity::Upstream)));
}
#endif
@@ -3014,4 +3016,14 @@ VisiblePosition previousPositionOf(const VisiblePosition& visiblePosition, Editi
return honorEditingBoundaryAtOrBefore(prev, visiblePosition.deepEquivalent());
}
+VisiblePosition previousPositionOf(const VisiblePosition& visiblePosition, EditingBoundaryCrossingRule rule)
+{
+ return previousPositionOfAlgorithm<EditingStrategy>(visiblePosition, rule);
+}
+
+VisiblePositionInComposedTree previousPositionOf(const VisiblePositionInComposedTree& visiblePosition, EditingBoundaryCrossingRule rule)
+{
+ return previousPositionOfAlgorithm<EditingInComposedTreeStrategy>(visiblePosition, rule);
+}
+
} // namespace blink
« no previous file with comments | « Source/core/editing/VisibleUnits.h ('k') | Source/core/editing/VisibleUnitsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698