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

Unified Diff: Source/core/dom/Element.cpp

Issue 18147020: Remove broken sibling selector optimization (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 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
« no previous file with comments | « Source/core/dom/Element.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 65f8110d6a13c28fcd2a1b11b14a86aad269b14f..eb34b08e8bdc63d1f1aade5a9c15be11ad581dd7 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -1442,22 +1442,22 @@ bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS
return false;
}
-PassRefPtr<RenderStyle> Element::styleForRenderer(int childIndex)
+PassRefPtr<RenderStyle> Element::styleForRenderer()
{
if (hasCustomStyleCallbacks()) {
if (RefPtr<RenderStyle> style = customStyleForRenderer())
return style.release();
}
- return originalStyleForRenderer(childIndex);
+ return originalStyleForRenderer();
}
-PassRefPtr<RenderStyle> Element::originalStyleForRenderer(int childIndex)
+PassRefPtr<RenderStyle> Element::originalStyleForRenderer()
{
- return document()->styleResolver()->styleForElement(this, childIndex);
+ return document()->styleResolver()->styleForElement(this);
}
-bool Element::recalcStyle(StyleChange change, int childIndex)
+bool Element::recalcStyle(StyleChange change)
{
ASSERT(document()->inStyleRecalc());
@@ -1481,7 +1481,7 @@ bool Element::recalcStyle(StyleChange change, int childIndex)
// FIXME: This still recalcs style twice when changing display types, but saves
// us from recalcing twice when going from none -> anything else which is more
// common, especially during lazy attach.
- newStyle = styleForRenderer(childIndex);
+ newStyle = styleForRenderer();
localChange = Node::diff(currentStyle.get(), newStyle.get(), document());
} else if (attached() && isActiveInsertionPoint(this)) {
// Active InsertionPoints will never have renderers so there's no reason to
@@ -1548,7 +1548,6 @@ bool Element::recalcStyle(StyleChange change, int childIndex)
int indexForChild = 1;
if (hasDirectAdjacentRules || hasIndirectAdjacentRules) {
for (Node *child = firstChild(); child; child = child->nextSibling()) {
- ++indexForChild;
if (!child->isElementNode())
continue;
Element* element = toElement(child);
@@ -1562,7 +1561,6 @@ bool Element::recalcStyle(StyleChange change, int childIndex)
// FIXME: Reversing the loop we call recalcStyle avoids an N^2 walk through the DOM to find the next renderer
// to insert before. The logic in NodeRenderingContext should be improved to make this unnecessary.
for (Node *child = lastChild(); child; child = child->previousSibling()) {
- indexForChild = max(--indexForChild, 0);
bool didReattach = false;
if (child->isTextNode()) {
@@ -1572,7 +1570,7 @@ bool Element::recalcStyle(StyleChange change, int childIndex)
if (shouldRecalcStyle(change, element)) {
parentPusher.push();
- didReattach = element->recalcStyle(change, indexForChild);
+ didReattach = element->recalcStyle(change);
}
}
« no previous file with comments | « Source/core/dom/Element.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698