Changeset 280586 in webkit

Timestamp:

Aug 3, 2021, 12:38:08 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Check that shadow root is connected in invalidateStyleAfterStyleSheetChange
​https://bugs.webkit.org/show_bug.cgi?id=227383

Patch by Rob Buis <​rbuis@igalia.com> on 2021-08-03
Reviewed by Antti Koivisto.

Source/WebCore:

Check that shadow root is connected in invalidateStyleAfterStyleSheetChange.

Test: fast/shadow-dom/shadow-tree-removal-crash.html

• style/StyleScope.cpp:

(WebCore::Style::Scope::updateActiveStyleSheets):

LayoutTests:

Add test for this.

• fast/shadow-dom/shadow-tree-removal-crash-expected.txt: Added.
• fast/shadow-dom/shadow-tree-removal-crash.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/shadow-tree-removal-crash-expected.txt (added)
• LayoutTests/fast/shadow-dom/shadow-tree-removal-crash.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-08-03  Rob Buis  <rbuis@igalia.com>
+
+        Check that shadow root is connected in invalidateStyleAfterStyleSheetChange
+        https://bugs.webkit.org/show_bug.cgi?id=227383
+
+        Reviewed by Antti Koivisto.
+
+        Add test for this.
+
+        * fast/shadow-dom/shadow-tree-removal-crash-expected.txt: Added.
+        * fast/shadow-dom/shadow-tree-removal-crash.html: Added.
+
 2021-08-02  Jean-Yves Avenard  <jya@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-08-03  Rob Buis  <rbuis@igalia.com>
+
+        Check that shadow root is connected in invalidateStyleAfterStyleSheetChange
+        https://bugs.webkit.org/show_bug.cgi?id=227383
+
+        Reviewed by Antti Koivisto.
+
+        Check that shadow root is connected in invalidateStyleAfterStyleSheetChange.
+
+        Test: fast/shadow-dom/shadow-tree-removal-crash.html
+
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::updateActiveStyleSheets):
+
 2021-08-02  Frédéric Wang  <fwang@igalia.com>
 

trunk/Source/WebCore/style/StyleScope.cpp

@@ -525 +525 @@
 void Scope::invalidateStyleAfterStyleSheetChange(const StyleSheetChange& styleSheetChange)
 {
+    if (m_shadowRoot && !m_shadowRoot->isConnected())
+        return;
+
     // If we are already parsing the body and so may have significant amount of elements, put some effort into trying to avoid style recalcs.
     bool invalidateAll = !m_document.bodyOrFrameset() || m_document.hasNodesWithNonFinalStyle() || m_document.hasNodesWithMissingStyle();