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

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

Issue 1328113005: Introduce composed tree version of characterAfter() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-07T18:55:16 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 22572939c1c125ff71c85cfae136235a02912d40..0feccec2f599e5a704cc678dbd444562b1ea1efb 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -2548,12 +2548,13 @@ static VisiblePosition skipToEndOfEditingBoundary(const VisiblePosition& pos, co
return firstEditableVisiblePositionAfterPositionInRoot(pos.deepEquivalent(), highestRoot);
}
-UChar32 characterAfter(const VisiblePosition& visiblePosition)
+template <typename Strategy>
+static UChar32 characterAfterAlgorithm(const VisiblePositionTemplate<Strategy>& visiblePosition)
{
// We canonicalize to the first of two equivalent candidates, but the second
// of the two candidates is the one that will be inside the text node
// containing the character after this visible position.
- Position pos = mostForwardCaretPosition(visiblePosition.deepEquivalent());
+ const PositionAlgorithm<Strategy> pos = mostForwardCaretPosition(visiblePosition.deepEquivalent());
if (!pos.isOffsetInAnchor())
return 0;
Node* containerNode = pos.computeContainerNode();
@@ -2568,6 +2569,16 @@ UChar32 characterAfter(const VisiblePosition& visiblePosition)
return textNode->data().characterStartingAt(offset);
}
+UChar32 characterAfter(const VisiblePosition& visiblePosition)
+{
+ return characterAfterAlgorithm<EditingStrategy>(visiblePosition);
+}
+
+UChar32 characterAfter(const VisiblePositionInComposedTree& visiblePosition)
+{
+ return characterAfterAlgorithm<EditingInComposedTreeStrategy>(visiblePosition);
+}
+
UChar32 characterBefore(const VisiblePosition& visiblePosition)
{
return characterAfter(previousPositionOf(visiblePosition));
« 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