Changeset 144031 in webkit

Timestamp:

Feb 26, 2013, 2:51:58 AM (14 years ago)

Author:

tasak@google.com

Message:

Shadow DOM styles appear to be over-eagerly shared
​https://bugs.webkit.org/show_bug.cgi?id=110797

Reviewed by Dimitri Glazkov.

Source/WebCore:

A style of a distributed node should not be shared, because the node
might be affected by styles in a shadow dom tree, i.e. :distributed
or something.

Test: fast/dom/shadow/no-style-sharing-with-distributed-nodes.html

• css/StyleResolver.cpp:

(WebCore::StyleResolver::locateCousinList):
Skip shadow hosts, because children of shadow hosts are distributed
nodes and cannot share their styles.

LayoutTests:

• fast/dom/shadow/no-style-sharing-with-distributed-nodes-expected.html: Added.
• fast/dom/shadow/no-style-sharing-with-distributed-nodes.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/dom/shadow/no-style-sharing-with-distributed-nodes-expected.html (added)
• LayoutTests/fast/dom/shadow/no-style-sharing-with-distributed-nodes.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleResolver.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-02-26  Takashi Sakamoto  <tasak@google.com>
+
+        Shadow DOM styles appear to be over-eagerly shared
+        https://bugs.webkit.org/show_bug.cgi?id=110797
+
+        Reviewed by Dimitri Glazkov.
+
+        * fast/dom/shadow/no-style-sharing-with-distributed-nodes-expected.html: Added.
+        * fast/dom/shadow/no-style-sharing-with-distributed-nodes.html: Added.
+
 2013-02-26  Ádám Kallai  <kadam@inf.u-szeged.hu>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-02-26  Takashi Sakamoto  <tasak@google.com>
+
+        Shadow DOM styles appear to be over-eagerly shared
+        https://bugs.webkit.org/show_bug.cgi?id=110797
+
+        Reviewed by Dimitri Glazkov.
+
+        A style of a distributed node should not be shared, because the node
+        might be affected by styles in a shadow dom tree, i.e. :distributed
+        or something.
+
+        Test: fast/dom/shadow/no-style-sharing-with-distributed-nodes.html
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::locateCousinList):
+        Skip shadow hosts, because children of shadow hosts are distributed
+        nodes and cannot share their styles.
+
 2013-02-26  Adam Klein  <adamk@chromium.org>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -876 +876 @@
             ++subcount;
             if (currentNode->renderStyle() == parentStyle && currentNode->lastChild()
-                && currentNode->isElementNode() && !parentElementPreventsSharing(toElement(currentNode))) {
+                && currentNode->isElementNode() && !parentElementPreventsSharing(toElement(currentNode))
+#if ENABLE(SHADOW_DOM)
+                && !toElement(currentNode)->shadow()
+#endif
+                ) {
                 // Adjust for unused reserved tries.
                 visitedNodeCount -= cStyleSearchThreshold - subcount;