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

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

Issue 1300303002: Introduce isVisuallyEquivalentCandidate() as replacement of PositionAlgorithm::isCandidate() (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: 2015-08-21T01:27:16 Rebase 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/Position.cpp ('k') | Source/core/editing/VisibleUnits.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 fe635e38e2fc8f62a85f36fb98c2de486a20469a..355ee9ce898c279d6ddd017e4b5a137a01f03eaf 100644
--- a/Source/core/editing/VisiblePosition.cpp
+++ b/Source/core/editing/VisiblePosition.cpp
@@ -253,7 +253,7 @@ Position VisiblePosition::leftVisuallyDistinctCandidate() const
p = Position::editingPositionOf(layoutObject->node(), offset);
- if ((p.isCandidate() && p.downstream() != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
+ if ((isVisuallyEquivalentCandidate(p) && p.downstream() != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
return p;
ASSERT(p != m_deepPosition);
@@ -415,7 +415,7 @@ Position VisiblePosition::rightVisuallyDistinctCandidate() const
p = Position::editingPositionOf(layoutObject->node(), offset);
- if ((p.isCandidate() && p.downstream() != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
+ if ((isVisuallyEquivalentCandidate(p) && p.downstream() != downstreamStart) || p.atStartOfTree() || p.atEndOfTree())
return p;
ASSERT(p != m_deepPosition);
@@ -548,9 +548,9 @@ static PositionType canonicalizeCandidate(const PositionType& candidate)
{
if (candidate.isNull())
return PositionType();
- ASSERT(candidate.isCandidate());
+ ASSERT(isVisuallyEquivalentCandidate(candidate));
PositionType upstream = candidate.upstream();
- if (upstream.isCandidate())
+ if (isVisuallyEquivalentCandidate(upstream))
return upstream;
return candidate;
}
@@ -582,10 +582,10 @@ static PositionType canonicalPosition(const PositionType& passedPosition)
Node* node = position.computeContainerNode();
PositionType candidate = position.upstream();
- if (candidate.isCandidate())
+ if (isVisuallyEquivalentCandidate(candidate))
return candidate;
candidate = position.downstream();
- if (candidate.isCandidate())
+ if (isVisuallyEquivalentCandidate(candidate))
return candidate;
// When neither upstream or downstream gets us to a candidate (upstream/downstream won't leave
« no previous file with comments | « Source/core/editing/Position.cpp ('k') | Source/core/editing/VisibleUnits.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698