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

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: Resolved conflicts. Created 5 years, 5 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
Index: Source/core/editing/htmlediting.cpp
diff --git a/Source/core/editing/htmlediting.cpp b/Source/core/editing/htmlediting.cpp
index 183a2580a9a40156124e80505bfb7b706f964086..76c226e863634a61b544a50229c96013742d32fc 100644
--- a/Source/core/editing/htmlediting.cpp
+++ b/Source/core/editing/htmlediting.cpp
@@ -355,12 +355,17 @@ PositionInComposedTree nextCandidate(const PositionInComposedTree& position)
Position nextVisuallyDistinctCandidate(const Position& position)
{
+ // TODO(changseok): Use PositionIterator instead.
Position p = position;
Position downstreamStart = p.downstream();
while (!p.atEndOfTree()) {
p = p.next(Character);
if (p.isCandidate() && p.downstream() != downstreamStart)
return p;
+ if (auto* node = p.containerNode()) {
+ if (!node->layoutObject())
+ p = lastPositionInOrAfterNode(node);
+ }
}
return Position();
}
@@ -391,12 +396,17 @@ PositionInComposedTree previousCandidate(const PositionInComposedTree& position)
template <typename PositionType>
PositionType previousVisuallyDistinctCandidateAlgorithm(const PositionType& position)
{
+ // TODO(changseok): Use PositionIterator instead.
PositionType p = position;
PositionType downstreamStart = p.downstream();
while (!p.atStartOfTree()) {
p = p.previous(Character);
if (p.isCandidate() && p.downstream() != downstreamStart)
return p;
+ if (auto* node = p.containerNode()) {
+ if (!node->layoutObject())
+ p = PositionType::firstPositionInOrBeforeNode(node);
+ }
}
return PositionType();
}
« Source/core/dom/PositionIterator.cpp ('K') | « Source/core/dom/PositionIterator.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698