Changeset 288099 in webkit

Timestamp:

Jan 17, 2022 11:44:14 AM (6 months ago)

Author:

Antti Koivisto

Message:

Layered @import rules in <style> should be preloaded
​https://bugs.webkit.org/show_bug.cgi?id=234094
<rdar://problem/86586969>

Reviewed by Dean Jackson.

Source/WebCore:

Test: http/tests/loading/preload-css-import-layer.html

• html/parser/CSSPreloadScanner.cpp:

(WebCore::CSSPreloadScanner::tokenize):
(WebCore::hasValidImportConditions):
(WebCore::CSSPreloadScanner::emitRule):

• html/parser/CSSPreloadScanner.h:

Allow @import rule containing layer condition to be preloaded.

LayoutTests:

• http/tests/loading/preload-css-import-layer-expected.txt: Added.
• http/tests/loading/preload-css-import-layer.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/loading/preload-css-import-layer-expected.txt (added)
• LayoutTests/http/tests/loading/preload-css-import-layer.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/CSSPreloadScanner.cpp (modified) (5 diffs)
• Source/WebCore/html/parser/CSSPreloadScanner.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2022-01-17  Antti Koivisto  <antti@apple.com>
+
+        Layered @import rules in <style> should be preloaded
+        https://bugs.webkit.org/show_bug.cgi?id=234094
+        <rdar://problem/86586969>
+
+        Reviewed by Dean Jackson.
+
+        * http/tests/loading/preload-css-import-layer-expected.txt: Added.
+        * http/tests/loading/preload-css-import-layer.html: Added.
+
 2022-01-17  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2022-01-17  Antti Koivisto  <antti@apple.com>
+
+        Layered @import rules in <style> should be preloaded
+        https://bugs.webkit.org/show_bug.cgi?id=234094
+        <rdar://problem/86586969>
+
+        Reviewed by Dean Jackson.
+
+        Test: http/tests/loading/preload-css-import-layer.html
+
+        * html/parser/CSSPreloadScanner.cpp:
+        (WebCore::CSSPreloadScanner::tokenize):
+        (WebCore::hasValidImportConditions):
+        (WebCore::CSSPreloadScanner::emitRule):
+        * html/parser/CSSPreloadScanner.h:
+
+        Allow @import rule containing layer condition to be preloaded.
+
 2022-01-17  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/parser/CSSPreloadScanner.cpp

@@ -99 +99 @@
             m_rule.clear();
             m_ruleValue.clear();
+            m_ruleConditions.clear();
             m_rule.append(c);
             m_state = Rule;
@@ -140 +141 @@
             m_state = DoneParsingImportRules;
         else {
-            // FIXME: media rules
-            m_state = Initial;
+            m_state = RuleConditions;
+            m_ruleConditions.append(c);
         }
+        break;
+    case RuleConditions:
+        if (c == ';')
+            emitRule();
+        else if (c == '{')
+            m_state = DoneParsingImportRules;
+        else
+            m_ruleConditions.append(c);
         break;
     case DoneParsingImportRules:
@@ -194 +203 @@
 }
 
+static bool hasValidImportConditions(StringView conditions)
+{
+    if (conditions.isEmpty())
+        return true;
+
+    conditions = conditions.stripLeadingAndTrailingMatchedCharacters(isHTMLSpace<UChar>);
+
+    // FIXME: Support multiple conditions.
+    // FIXME: Support media queries.
+    // FIXME: Support supports().
+
+    auto end = conditions.find(')');
+    if (end != notFound)
+        return end == conditions.length() - 1 && conditions.startsWith("layer(");
+
+    return conditions == "layer";
+}
+
 void CSSPreloadScanner::emitRule()
 {
@@ -199 +226 @@
     if (equalLettersIgnoringASCIICase(rule, "import")) {
         String url = parseCSSStringOrURL(m_ruleValue.data(), m_ruleValue.size());
-        if (!url.isEmpty()) {
+        StringView conditions(m_ruleConditions.data(), m_ruleConditions.size());
+        if (!url.isEmpty() && hasValidImportConditions(conditions)) {
             URL baseElementURL; // FIXME: This should be passed in from the HTMLPreloadScanner via scan(): without it we will get relative URLs wrong.
             // FIXME: Should this be including the charset in the preload request?
@@ -211 +239 @@
     m_rule.clear();
     m_ruleValue.clear();
-}
-
-}
+    m_ruleConditions.clear();
+}
+
+}

trunk/Source/WebCore/html/parser/CSSPreloadScanner.h

@@ -54 +54 @@
         RuleValue,
         AfterRuleValue,
+        RuleConditions,
         DoneParsingImportRules,
     };
@@ -63 +64 @@
     Vector<UChar> m_rule;
     Vector<UChar> m_ruleValue;
+    Vector<UChar> m_ruleConditions;
 
     // Only non-zero during scan()