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

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

Issue 1338953002: Introduce composed tree version of startOfWord() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-14T11:03:14 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 06681bdff83d8c8ce868b3033549de311078cf71..fc38663c1f53bcebfb7aa4885e7595db70dc3030 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -828,11 +828,12 @@ static unsigned startWordBoundary(const UChar* characters, unsigned length, unsi
return start;
}
-VisiblePosition startOfWord(const VisiblePosition& c, EWordSide side)
+template <typename Strategy>
+static VisiblePositionTemplate<Strategy> startOfWordAlgorithm(const VisiblePositionTemplate<Strategy>& c, EWordSide side)
{
- // FIXME: This returns a null VP for c at the start of the document
- // and side == LeftWordIfOnBoundary
- VisiblePosition p = c;
+ // TODO(yosin) This returns a null VP for c at the start of the document
+ // and |side| == |LeftWordIfOnBoundary|
+ VisiblePositionTemplate<Strategy> p = c;
if (side == RightWordIfOnBoundary) {
// at paragraph end, the startofWord is the current position
if (isEndOfParagraph(c))
@@ -845,6 +846,16 @@ VisiblePosition startOfWord(const VisiblePosition& c, EWordSide side)
return previousBoundary(p, startWordBoundary);
}
+VisiblePosition startOfWord(const VisiblePosition& c, EWordSide side)
+{
+ return startOfWordAlgorithm<EditingStrategy>(c, side);
+}
+
+VisiblePositionInComposedTree startOfWord(const VisiblePositionInComposedTree& c, EWordSide side)
+{
+ return startOfWordAlgorithm<EditingInComposedTreeStrategy>(c, side);
+}
+
static unsigned endWordBoundary(const UChar* characters, unsigned length, unsigned offset, BoundarySearchContextAvailability mayHaveMoreContext, bool& needMoreContext)
{
ASSERT(offset <= length);
« 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