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

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

Issue 1326313002: Introduce composed tree version of leftPositionOf() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-09-09T12:49:11 Add a comment about DOM version of leftPositoin() for composed tree 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 5f990354180ff02420d088e62727d991d5d2bf98..d47628a3e914c6b878f4b571df2fd356ddc85a06 100644
--- a/Source/core/editing/VisibleUnits.cpp
+++ b/Source/core/editing/VisibleUnits.cpp
@@ -162,7 +162,7 @@ PositionInComposedTree canonicalPositionOf(const PositionInComposedTree& positio
}
template <typename Strategy>
-static PositionWithAffinityTemplate<Strategy> honorEditingBoundaryAtOrBeforeAlgorithm(const PositionWithAffinityTemplate<Strategy>& pos, const PositionAlgorithm<Strategy>& anchor)
+static PositionWithAffinityTemplate<Strategy> honorEditingBoundaryAtOrBefore(const PositionWithAffinityTemplate<Strategy>& pos, const PositionAlgorithm<Strategy>& anchor)
{
if (pos.isNull())
return pos;
@@ -193,19 +193,10 @@ static PositionWithAffinityTemplate<Strategy> honorEditingBoundaryAtOrBeforeAlgo
return lastEditablePositionBeforePositionInRoot(pos.position(), highestRoot);
}
-static PositionWithAffinity honorEditingBoundaryAtOrBeforeOf(const PositionWithAffinity& pos, const Position& anchor)
-{
- return honorEditingBoundaryAtOrBeforeAlgorithm(pos, anchor);
-}
-
-static PositionInComposedTreeWithAffinity honorEditingBoundaryAtOrBeforeOf(const PositionInComposedTreeWithAffinity& pos, const PositionInComposedTree& anchor)
-{
- return honorEditingBoundaryAtOrBeforeAlgorithm(pos, anchor);
-}
-
-static VisiblePosition honorEditingBoundaryAtOrBefore(const VisiblePosition& pos, const Position& anchor)
+template <typename Strategy>
+static VisiblePositionTemplate<Strategy> honorEditingBoundaryAtOrBefore(const VisiblePositionTemplate<Strategy>& pos, const PositionAlgorithm<Strategy>& anchor)
{
- return createVisiblePosition(honorEditingBoundaryAtOrBeforeOf(pos.toPositionWithAffinity(), anchor));
+ return createVisiblePosition(honorEditingBoundaryAtOrBefore(pos.toPositionWithAffinity(), anchor));
}
template <typename Strategy>
@@ -961,7 +952,7 @@ static PositionWithAffinityTemplate<Strategy> startOfLine(const PositionWithAffi
}
}
- return honorEditingBoundaryAtOrBeforeOf(visPos, c.position());
+ return honorEditingBoundaryAtOrBefore(visPos, c.position());
}
static PositionWithAffinity startOfLine(const PositionWithAffinity& currentPosition)
@@ -2597,14 +2588,16 @@ UChar32 characterBefore(const VisiblePosition& visiblePosition)
return characterAfter(previousPositionOf(visiblePosition));
}
-static Position leftVisuallyDistinctCandidate(const VisiblePosition& visiblePosition)
+template <typename Strategy>
+static PositionAlgorithm<Strategy> leftVisuallyDistinctCandidate(const VisiblePositionTemplate<Strategy>& visiblePosition)
{
- const Position deepPosition = visiblePosition.deepEquivalent();
- Position p = deepPosition;
+ const PositionAlgorithm<Strategy> deepPosition = visiblePosition.deepEquivalent();
+ PositionAlgorithm<Strategy> p = deepPosition;
+
if (p.isNull())
- return Position();
+ return PositionAlgorithm<Strategy>();
- Position downstreamStart = mostForwardCaretPosition(p);
+ const PositionAlgorithm<Strategy> downstreamStart = mostForwardCaretPosition(p);
TextDirection primaryDirection = primaryDirectionOf(*p.anchorNode());
const TextAffinity affinity = visiblePosition.affinity();
@@ -2642,13 +2635,13 @@ static Position leftVisuallyDistinctCandidate(const VisiblePosition& visiblePosi
// Overshot to the left.
InlineBox* prevBox = box->prevLeafChildIgnoringLineBreak();
if (!prevBox) {
- Position positionOnLeft = primaryDirection == LTR ? previousVisuallyDistinctCandidate(deepPosition) : nextVisuallyDistinctCandidate(deepPosition);
+ PositionAlgorithm<Strategy> positionOnLeft = primaryDirection == LTR ? previousVisuallyDistinctCandidate(visiblePosition.deepEquivalent()) : nextVisuallyDistinctCandidate(visiblePosition.deepEquivalent());
if (positionOnLeft.isNull())
- return Position();
+ return PositionAlgorithm<Strategy>();
InlineBox* boxOnLeft = computeInlineBoxPosition(positionOnLeft, affinity, primaryDirection).inlineBox;
if (boxOnLeft && boxOnLeft->root() == box->root())
- return Position();
+ return PositionAlgorithm<Strategy>();
return positionOnLeft;
}
@@ -2712,7 +2705,8 @@ static Position leftVisuallyDistinctCandidate(const VisiblePosition& visiblePosi
continue;
}
} else {
- // Trailing edge of a secondary run. Set to the leading edge of the entire run.
+ // Trailing edge of a secondary run. Set to the leading edge of
+ // the entire run.
while (true) {
while (InlineBox* nextBox = box->nextLeafChild()) {
if (nextBox->bidiLevel() < level)
@@ -2737,7 +2731,7 @@ static Position leftVisuallyDistinctCandidate(const VisiblePosition& visiblePosi
break;
}
- p = Position::editingPositionOf(layoutObject->node(), offset);
+ p = PositionAlgorithm<Strategy>::editingPositionOf(layoutObject->node(), offset);
if ((isVisuallyEquivalentCandidate(p) && mostForwardCaretPosition(p) != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
return p;
@@ -2746,19 +2740,30 @@ static Position leftVisuallyDistinctCandidate(const VisiblePosition& visiblePosi
}
}
-VisiblePosition leftPositionOf(const VisiblePosition& visiblePosition)
+template <typename Strategy>
+VisiblePositionTemplate<Strategy> leftPositionOfAlgorithm(const VisiblePositionTemplate<Strategy>& visiblePosition)
{
- const Position pos = leftVisuallyDistinctCandidate(visiblePosition);
+ const PositionAlgorithm<Strategy> pos = leftVisuallyDistinctCandidate(visiblePosition);
// TODO(yosin) Why can't we move left from the last position in a tree?
if (pos.atStartOfTree() || pos.atEndOfTree())
- return VisiblePosition();
+ return VisiblePositionTemplate<Strategy>();
- VisiblePosition left = createVisiblePosition(pos);
+ const VisiblePositionTemplate<Strategy> left = createVisiblePosition(pos);
ASSERT(left.deepEquivalent() != visiblePosition.deepEquivalent());
return directionOfEnclosingBlock(left.deepEquivalent()) == LTR ? honorEditingBoundaryAtOrBefore(left, visiblePosition.deepEquivalent()) : honorEditingBoundaryAtOrAfter(left, visiblePosition.deepEquivalent());
}
+VisiblePosition leftPositionOf(const VisiblePosition& visiblePosition)
+{
+ return leftPositionOfAlgorithm<EditingStrategy>(visiblePosition);
+}
+
+VisiblePositionInComposedTree leftPositionOf(const VisiblePositionInComposedTree& visiblePosition)
+{
+ return leftPositionOfAlgorithm<EditingInComposedTreeStrategy>(visiblePosition);
+}
+
static Position rightVisuallyDistinctCandidate(const VisiblePosition& visiblePosition)
{
const Position deepPosition = visiblePosition.deepEquivalent();
« 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