Changeset 217708 in webkit

Timestamp:

Jun 2, 2017 3:18:54 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Invalidate the shadow subtree style when slotted pseudo rules are present.
​https://bugs.webkit.org/show_bug.cgi?id=172822

Patch by Emilio Cobos Álvarez <​ecobos@igalia.com> on 2017-06-02
Reviewed by Antti Koivisto.

No new tests, this is tested by
fast/shadow-dom/css-scoping-slot-with-id.html, once we don't force an
Inherit style change for slots. I could add some more tests for stuff
with descendant combinators and similar I guess, though.

• style/AttributeChangeInvalidation.cpp:

(WebCore::Style::AttributeChangeInvalidation::invalidateStyle):

• style/ClassChangeInvalidation.cpp:

(WebCore::Style::ClassChangeInvalidation::invalidateStyle):

• style/IdChangeInvalidation.cpp:

(WebCore::Style::IdChangeInvalidation::invalidateStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/AttributeChangeInvalidation.cpp (modified) (2 diffs)
• style/ClassChangeInvalidation.cpp (modified) (2 diffs)
• style/IdChangeInvalidation.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-06-02  Emilio Cobos Álvarez  <ecobos@igalia.com>
+
+        Invalidate the shadow subtree style when slotted pseudo rules are present.
+        https://bugs.webkit.org/show_bug.cgi?id=172822
+
+        Reviewed by Antti Koivisto.
+
+        No new tests, this is tested by
+        fast/shadow-dom/css-scoping-slot-with-id.html, once we don't force an
+        Inherit style change for slots. I could add some more tests for stuff
+        with descendant combinators and similar I guess, though.
+
+        * style/AttributeChangeInvalidation.cpp:
+        (WebCore::Style::AttributeChangeInvalidation::invalidateStyle):
+        * style/ClassChangeInvalidation.cpp:
+        (WebCore::Style::ClassChangeInvalidation::invalidateStyle):
+        * style/IdChangeInvalidation.cpp:
+        (WebCore::Style::IdChangeInvalidation::invalidateStyle):
+
 2017-06-02  Miguel Gomez  <magomez@igalia.com>
 

trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp

@@ -29 +29 @@
 #include "DocumentRuleSets.h"
 #include "ElementIterator.h"
+#include "HTMLSlotElement.h"
 #include "ShadowRoot.h"
 #include "StyleInvalidator.h"
@@ -98 +99 @@
         mayAffectShadowTree = true;
 
+    if (is<HTMLSlotElement>(m_element) && !ruleSets.authorStyle().slottedPseudoElementRules().isEmpty())
+        mayAffectShadowTree = true;
+
     if (mayAffectShadowTree) {
         m_element.invalidateStyleForSubtree();

trunk/Source/WebCore/style/ClassChangeInvalidation.cpp

@@ -29 +29 @@
 #include "DocumentRuleSets.h"
 #include "ElementChildIterator.h"
+#include "HTMLSlotElement.h"
 #include "ShadowRoot.h"
 #include "SpaceSplitString.h"
@@ -141 +142 @@
         mayAffectShadowTree = true;
 
+    if (is<HTMLSlotElement>(m_element) && !ruleSets.authorStyle().slottedPseudoElementRules().isEmpty())
+        mayAffectShadowTree = true;
+
     if (mayAffectShadowTree) {
         // FIXME: We should do fine-grained invalidation for shadow tree.

trunk/Source/WebCore/style/IdChangeInvalidation.cpp

@@ -29 +29 @@
 #include "DocumentRuleSets.h"
 #include "ElementChildIterator.h"
+#include "HTMLSlotElement.h"
 #include "ShadowRoot.h"
 #include "StyleResolver.h"
@@ -84 +85 @@
         mayAffectShadowTree = true;
 
+    if (is<HTMLSlotElement>(m_element) && !ruleSets.authorStyle().slottedPseudoElementRules().isEmpty())
+        mayAffectShadowTree = true;
+
     if (mayAffectShadowTree) {
         m_element.invalidateStyleForSubtree();