Changeset 109906 in webkit

Timestamp:

Mar 6, 2012 4:42:54 AM (12 years ago)

Author:

rolandsteiner@chromium.org

Message:

r109563 caused perf regression
​https://bugs.webkit.org/show_bug.cgi?id=80404

Add test for Element or ShadowRoot.

Reviewed by Antti Koivisto.

No new tests. (fix)

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::pushParentElement):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-06  Roland Steiner  <rolandsteiner@chromium.org>
+
+        r109563 caused perf regression
+        https://bugs.webkit.org/show_bug.cgi?id=80404
+
+        Add test for Element or ShadowRoot.
+
+        Reviewed by Antti Koivisto.
+
+        No new tests. (fix)
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::pushParentElement):
+
 2012-03-06  Pavel Podivilov  <podivilov@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -552 +552 @@
 void CSSStyleSelector::pushParentElement(Element* parent)
 {
-    const ContainerNode* parentsParent = parent->parentOrHostNode();
+    const ContainerNode* parentsParent = parent->parentOrHostElement();
+
     // We are not always invoked consistently. For example, script execution can cause us to enter
     // style recalc in the middle of tree building. We may also be invoked from somewhere within the tree.
@@ -561 +562 @@
     else
         m_checker.pushParent(parent);
-    pushScope(parent, parentsParent);
+
+    // Note: We mustn't skip ShadowRoot nodes for the scope stack.
+    pushScope(parent, parent->parentOrHostNode());
 }