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

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

Issue 1189543002: Do not traverse nodes not having a layout object while searching editable visible position. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated patch 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/dom/PositionIterator.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/editing/htmlediting.cpp
diff --git a/Source/core/editing/htmlediting.cpp b/Source/core/editing/htmlediting.cpp
index 8aae1baf0cc4d1310f9b90ef1313102250679069..62db3da88a8731cc379f233bc0ec0fc289f56368 100644
--- a/Source/core/editing/htmlediting.cpp
+++ b/Source/core/editing/htmlediting.cpp
@@ -334,12 +334,16 @@ template <typename Strategy>
PositionAlgorithm<Strategy> nextCandidateAlgorithm(const PositionAlgorithm<Strategy>& position)
{
PositionIteratorAlgorithm<Strategy> p(position);
+
+ p.increment();
while (!p.atEnd()) {
- p.increment();
PositionAlgorithm<Strategy> candidate = p.computePosition();
if (candidate.isCandidate())
return candidate;
+
+ p.increment();
}
+
return PositionAlgorithm<Strategy>();
}
@@ -359,15 +363,20 @@ PositionInComposedTree nextCandidate(const PositionInComposedTree& position)
Position nextVisuallyDistinctCandidate(const Position& position)
{
if (position.isNull())
- return position;
+ return Position();
+
PositionIterator p(position);
Position downstreamStart = position.downstream();
+
+ p.increment();
while (!p.atEnd()) {
- p.increment();
Position candidate = p.computePosition();
if (candidate.isCandidate() && candidate.downstream() != downstreamStart)
return candidate;
+
+ p.increment();
}
+
return Position();
}
@@ -375,12 +384,16 @@ template <typename Strategy>
PositionAlgorithm<Strategy> previousCandidateAlgorithm(const PositionAlgorithm<Strategy>& position)
{
PositionIteratorAlgorithm<Strategy> p(position);
+
+ p.decrement();
while (!p.atStart()) {
- p.decrement();
PositionAlgorithm<Strategy> candidate = p.computePosition();
if (candidate.isCandidate())
return candidate;
+
+ p.decrement();
}
+
return PositionAlgorithm<Strategy>();
}
@@ -401,15 +414,20 @@ template <typename Strategy>
PositionAlgorithm<Strategy> previousVisuallyDistinctCandidateAlgorithm(const PositionAlgorithm<Strategy>& position)
{
if (position.isNull())
- return position;
+ return PositionAlgorithm<Strategy>();
+
PositionIteratorAlgorithm<Strategy> p(position);
PositionAlgorithm<Strategy> downstreamStart = position.downstream();
+
+ p.decrement();
while (!p.atStart()) {
- p.decrement();
PositionAlgorithm<Strategy> candidate = p.computePosition();
if (candidate.isCandidate() && candidate.downstream() != downstreamStart)
return candidate;
+
+ p.decrement();
}
+
return PositionAlgorithm<Strategy>();
}
« no previous file with comments | « Source/core/dom/PositionIterator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698