Changeset 199060 in webkit

Timestamp:

Apr 5, 2016 9:45:51 AM (8 years ago)

Author:

Antti Koivisto

Message:

Shadow DOM: :host() From The First Shadow Context Should Not Style All Shadow Context
​https://bugs.webkit.org/show_bug.cgi?id=156235
<rdar://problem/24668206>

Reviewed by Andreas Kling.

Source/WebCore:

Test: fast/shadow-dom/host-style-sharing.html

• style/StyleSharingResolver.cpp:

(WebCore::Style::SharingResolver::resolve):
(WebCore::Style::SharingResolver::canShareStyleWithElement):

Disallow style sharing for shadow hosts affected by :host pseudo class rules.

LayoutTests:

• fast/shadow-dom/host-style-sharing-expected.html: Added.
• fast/shadow-dom/host-style-sharing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/host-style-sharing-expected.html (added)
• LayoutTests/fast/shadow-dom/host-style-sharing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleSharingResolver.cpp (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-04-05  Antti Koivisto  <antti@apple.com>
+
+        Shadow DOM: :host() From The First Shadow Context Should Not Style All Shadow Context
+        https://bugs.webkit.org/show_bug.cgi?id=156235
+        <rdar://problem/24668206>
+
+        Reviewed by Andreas Kling.
+
+        * fast/shadow-dom/host-style-sharing-expected.html: Added.
+        * fast/shadow-dom/host-style-sharing.html: Added.
+
 2016-04-05  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-04-05  Antti Koivisto  <antti@apple.com>
+
+        Shadow DOM: :host() From The First Shadow Context Should Not Style All Shadow Context
+        https://bugs.webkit.org/show_bug.cgi?id=156235
+        <rdar://problem/24668206>
+
+        Reviewed by Andreas Kling.
+
+        Test: fast/shadow-dom/host-style-sharing.html
+
+        * style/StyleSharingResolver.cpp:
+        (WebCore::Style::SharingResolver::resolve):
+        (WebCore::Style::SharingResolver::canShareStyleWithElement):
+
+            Disallow style sharing for shadow hosts affected by :host pseudo class rules.
+
 2016-04-05  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/style/StyleSharingResolver.cpp

@@ -34 +34 @@
 #include "RenderStyle.h"
 #include "SVGElement.h"
+#include "ShadowRoot.h"
 #include "StyleUpdate.h"
 #include "StyledElement.h"
@@ -96 +97 @@
     if (elementHasDirectionAuto(element))
         return nullptr;
+#if ENABLE(SHADOW_DOM)
+    if (element.shadowRoot() && !element.shadowRoot()->styleResolver().ruleSets().authorStyle()->hostPseudoClassRules().isEmpty())
+        return nullptr;
+#endif
 
     Context context {
@@ -278 +283 @@
     if (element.matchesInvalidPseudoClass() != element.matchesValidPseudoClass())
         return false;
+
+#if ENABLE(SHADOW_DOM)
+    if (element.shadowRoot() && !element.shadowRoot()->styleResolver().ruleSets().authorStyle()->hostPseudoClassRules().isEmpty())
+        return nullptr;
+#endif
 
 #if ENABLE(VIDEO_TRACK)