Changeset 286599 in webkit

Timestamp:

Dec 7, 2021, 10:20:17 AM (5 years ago)

Author:

Antti Koivisto

Message:

Assertion after removing stylesheet with loading @import rule
​https://bugs.webkit.org/show_bug.cgi?id=233928

Reviewed by Alan Bujtas.

Source/WebCore:

Tests: fast/css/import-and-remove-assert.html

• dom/InlineStyleSheetOwner.cpp:

(WebCore::InlineStyleSheetOwner::removedFromDocument):

Ensure we notify Style::Scope

LayoutTests:

• fast/css/import-and-remove-assert-expected.txt: Added.
• fast/css/import-and-remove-assert.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/import-and-remove-assert-expected.txt (added)
• LayoutTests/fast/css/import-and-remove-assert.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/InlineStyleSheetOwner.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-12-07  Antti Koivisto  <antti@apple.com>
+
+        Assertion after removing stylesheet with loading @import rule
+        https://bugs.webkit.org/show_bug.cgi?id=233928
+
+        Reviewed by Alan Bujtas.
+
+        * fast/css/import-and-remove-assert-expected.txt: Added.
+        * fast/css/import-and-remove-assert.html: Added.
+
 2021-12-03  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-07  Antti Koivisto  <antti@apple.com>
+
+        Assertion after removing stylesheet with loading @import rule
+        https://bugs.webkit.org/show_bug.cgi?id=233928
+
+        Reviewed by Alan Bujtas.
+
+        Tests: fast/css/import-and-remove-assert.html
+
+        * dom/InlineStyleSheetOwner.cpp:
+        (WebCore::InlineStyleSheetOwner::removedFromDocument):
+
+        Ensure we notify Style::Scope
+
 2021-12-07  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp

@@ -97 +97 @@
 {
     if (m_styleScope) {
+        if (m_sheet && m_sheet->isLoading())
+            m_styleScope->removePendingSheet(element);
         m_styleScope->removeStyleSheetCandidateNode(element);
         m_styleScope = nullptr;