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

Unified Diff: Source/core/css/SelectorChecker.cpp

Issue 15871005: Avoid N^2 walk placing renderers when building the render tree (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Merging ToT Created 7 years, 7 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/css/SelectorChecker.cpp
diff --git a/Source/core/css/SelectorChecker.cpp b/Source/core/css/SelectorChecker.cpp
index cde161331e076fd622ec972a06ee67b4f66e1a85..7195749877c54d0d4caa259ea4cfdef63f0d6c79 100644
--- a/Source/core/css/SelectorChecker.cpp
+++ b/Source/core/css/SelectorChecker.cpp
@@ -494,7 +494,8 @@ bool SelectorChecker::checkOne(const SelectorCheckingContext& context, const Sib
if (!selector->parseNth())
break;
if (Element* parentElement = element->parentElement()) {
- int count = 1 + siblingTraversalStrategy.countElementsBefore(element);
+ // FIXME: We should always have the index passed in to avoid needing countElementsBefore.
+ int count = context.childIndex ? context.childIndex : 1 + siblingTraversalStrategy.countElementsBefore(element);
ojan 2013/05/31 18:05:07 Not sure where, but that childIndices start at 1 p
if (m_mode == ResolvingStyle) {
RenderStyle* childStyle = context.elementStyle ? context.elementStyle : element->renderStyle();
element->setChildIndex(count);
@@ -527,7 +528,8 @@ bool SelectorChecker::checkOne(const SelectorCheckingContext& context, const Sib
parentElement->setChildrenAffectedByBackwardPositionalRules();
if (!parentElement->isFinishedParsingChildren())
return false;
- int count = 1 + siblingTraversalStrategy.countElementsAfter(element);
+ // FIXME: We should always have the index passed in to avoid needing countElementsAfter.
+ int count = context.childIndex ? context.childIndex : 1 + siblingTraversalStrategy.countElementsAfter(element);
if (selector->matchNth(count))
return true;
}

Powered by Google App Engine
This is Rietveld 408576698