Changeset 288879 in webkit

Timestamp:

Feb 1, 2022 8:41:43 AM (6 months ago)

Author:

Oriol Brufau

Message:

[css-cascade] Fix removal of not yet loaded CSS @import
​https://bugs.webkit.org/show_bug.cgi?id=235930

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Add new test.

• web-platform-tests/css/css-cascade/import-removal-expected.html: Added.
• web-platform-tests/css/css-cascade/import-removal.html: Added.

Source/WebCore:

When removing a not yet loaded CSS @import, the hasPendingSheet() flag
was not cleared. This resulted in a completely blank page.
This patch makes sure to cancel the load before deleting the rule.

Test: imported/w3c/web-platform-tests/css/css-cascade/import-removal.html

• css/StyleRuleImport.cpp:

(WebCore::StyleRuleImport::cancelLoad):

• css/StyleRuleImport.h:
• css/StyleSheetContents.cpp:

(WebCore::StyleSheetContents::wrapperDeleteRule):

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-removal-expected.html (added)
• LayoutTests/imported/w3c/web-platform-tests/css/css-cascade/import-removal.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleRuleImport.cpp (modified) (1 diff)
• Source/WebCore/css/StyleRuleImport.h (modified) (1 diff)
• Source/WebCore/css/StyleSheetContents.cpp (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2022-02-01  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Fix removal of not yet loaded CSS @import
+        https://bugs.webkit.org/show_bug.cgi?id=235930
+
+        Reviewed by Antti Koivisto.
+
+        Add new test.
+
+        * web-platform-tests/css/css-cascade/import-removal-expected.html: Added.
+        * web-platform-tests/css/css-cascade/import-removal.html: Added.
+
 2022-02-01  Tim Nguyen  <ntim@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-02-01  Oriol Brufau  <obrufau@igalia.com>
+
+        [css-cascade] Fix removal of not yet loaded CSS @import
+        https://bugs.webkit.org/show_bug.cgi?id=235930
+
+        Reviewed by Antti Koivisto.
+
+        When removing a not yet loaded CSS @import, the hasPendingSheet() flag
+        was not cleared. This resulted in a completely blank page.
+        This patch makes sure to cancel the load before deleting the rule.
+
+        Test: imported/w3c/web-platform-tests/css/css-cascade/import-removal.html
+
+        * css/StyleRuleImport.cpp:
+        (WebCore::StyleRuleImport::cancelLoad):
+        * css/StyleRuleImport.h:
+        * css/StyleSheetContents.cpp:
+        (WebCore::StyleSheetContents::wrapperDeleteRule):
+
 2022-02-01  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/css/StyleRuleImport.cpp

@@ -51 +51 @@
     if (!m_mediaQueries)
         m_mediaQueries = MediaQuerySet::create(String(), MediaQueryParserContext());
+}
+
+void StyleRuleImport::cancelLoad()
+{
+    if (!isLoading())
+        return;
+
+    m_loading = false;
+    if (m_parentStyleSheet)
+        m_parentStyleSheet->checkLoaded();
 }
 

trunk/Source/WebCore/css/StyleRuleImport.h

@@ -43 +43 @@
     void setParentStyleSheet(StyleSheetContents* sheet) { ASSERT(sheet); m_parentStyleSheet = sheet; }
     void clearParentStyleSheet() { m_parentStyleSheet = 0; }
+    void cancelLoad();
 
     String href() const { return m_strHref; }

trunk/Source/WebCore/css/StyleSheetContents.cpp

@@ -326 +326 @@
 
     if (childVectorIndex < m_importRules.size()) {
+        m_importRules[childVectorIndex]->cancelLoad();
         m_importRules[childVectorIndex]->clearParentStyleSheet();
         m_importRules.remove(childVectorIndex);