[CSS] @font-palette-values family-name supports multiple values

https://bugs.webkit.org/show_bug.cgi?id=252569 rdar://105975619 Reviewed by Tim Nguyen. This patch allows @font-palette-values family-name descriptor to have a list of family names (per spec). https://drafts.csswg.org/css-fonts-4/#family-name-syntax * LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36-expected.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36-ref.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36.html: Added. * LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt: * LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid-expected.txt: * Source/WebCore/css/CSSFontPaletteValuesRule.cpp: (WebCore::CSSFontPaletteValuesRule::fontFamily const): (WebCore::CSSFontPaletteValuesRule::cssText const): (WebCore::CSSFontPaletteValuesRule::~CSSFontPaletteValuesRule): Deleted. * Source/WebCore/css/CSSFontSelector.cpp: (WebCore::CSSFontSelector::addFontPaletteValuesRule): * Source/WebCore/css/CSSProperties.json: * Source/WebCore/css/StyleRule.cpp: (WebCore::StyleRuleFontPaletteValues::create): (WebCore::StyleRuleFontPaletteValues::StyleRuleFontPaletteValues): * Source/WebCore/css/StyleRule.h: * Source/WebCore/css/parser/CSSParserImpl.cpp: (WebCore::CSSParserImpl::consumeFontFeatureValuesRule): (WebCore::CSSParserImpl::consumeFontPaletteValuesRule): * Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp: (WebCore::CSSPropertyParserHelpers::consumeFamilyNameListRaw): (WebCore::CSSPropertyParserHelpers::consumeFamilyNameList): * Source/WebCore/css/parser/CSSPropertyParserHelpers.h: Canonical link: https://commits.webkit.org/267411@main
WebKit · Aug 29, 2023 · 83db139 · 83db139
1 parent f577450
commit 83db139
Show file tree

Hide file tree

Showing 13 changed files with 136 additions and 32 deletions.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36-expected.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36-expected.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+@font-face {
+    font-family: "COLR-test-font";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+
+@font-palette-values --MyPalette {
+    font-family: "COLR-test-font";
+    base-palette: 2;
+}
+</style>
+</head>
+<body>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36-ref.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<style>
+@font-face {
+    font-family: "COLR-test-font";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+
+@font-palette-values --MyPalette {
+    font-family: "COLR-test-font";
+    base-palette: 2;
+}
+</style>
+</head>
+<body>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+</body>
+</html>
diff --git a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36.html b/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-36.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>font-palette multiple family-name and @font-palette-values</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts/#font-palette-prop">
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-palette-values">
+<link rel="match" href="font-palette-36-ref.html">
+<style>
+@font-face {
+    font-family: "COLR-test-font";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+@font-face {
+    font-family: "foo bar";
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+@font-face {
+    font-family: foo;
+    src: url("resources/COLR-palettes-test-font.ttf") format("truetype");
+}
+@font-palette-values --MyPalette {
+    font-family: "COLR-test-font", "foo bar", foo;
+    base-palette: light;
+}
+</style>
+</head>
+<body>
+<div style="font: 48px 'COLR-test-font'; font-palette: --MyPalette;">A</div>
+<div style="font: 48px foo; font-palette: --MyPalette;">A</div>
+<div style="font: 48px 'foo bar'; font-palette: --MyPalette;">A</div>
+</body>
+</html>
diff --git a/...ted/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt b/...ted/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-invalid-expected.txt
@@ -1,6 +1,6 @@
 
 PASS CSS Fonts Module Level 4: parsing @font-palette-values
-PASS CSS Fonts Module Level 4: parsing @font-palette-values 1
+FAIL CSS Fonts Module Level 4: parsing @font-palette-values 1 assert_equals: expected -1 but got 27
 PASS CSS Fonts Module Level 4: parsing @font-palette-values 2
 PASS CSS Fonts Module Level 4: parsing @font-palette-values 3
 PASS CSS Fonts Module Level 4: parsing @font-palette-values 4

diff --git a/...orted/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid-expected.txt b/...orted/w3c/web-platform-tests/css/css-fonts/parsing/font-palette-values-valid-expected.txt
@@ -31,5 +31,5 @@ PASS CSS Fonts Module Level 4: parsing @font-palette-values 28
 PASS CSS Fonts Module Level 4: parsing @font-palette-values 29
 PASS CSS Fonts Module Level 4: parsing @font-palette-values 30
 PASS CSS Fonts Module Level 4: parsing @font-palette-values 31
-FAIL CSS Fonts Module Level 4: parsing @font-palette-values 32 assert_equals: expected "foo, bar, baz" but got ""
+PASS CSS Fonts Module Level 4: parsing @font-palette-values 32
 
diff --git a/Source/WebCore/css/CSSFontPaletteValuesRule.cpp b/Source/WebCore/css/CSSFontPaletteValuesRule.cpp
@@ -33,6 +33,7 @@
 #include "StyleProperties.h"
 #include "StyleRule.h"
 #include <wtf/text/StringBuilder.h>
+#include <wtf/text/WTFString.h>
 
 namespace WebCore {
 
@@ -42,9 +43,7 @@ CSSFontPaletteValuesRule::CSSFontPaletteValuesRule(StyleRuleFontPaletteValues& f
 {
 }
 
-CSSFontPaletteValuesRule::~CSSFontPaletteValuesRule()
-{
-}
+CSSFontPaletteValuesRule::~CSSFontPaletteValuesRule() = default;
 
 String CSSFontPaletteValuesRule::name() const
 {
@@ -53,7 +52,10 @@ String CSSFontPaletteValuesRule::name() const
 
 String CSSFontPaletteValuesRule::fontFamily() const
 {
-    return m_fontPaletteValuesRule->fontFamily();
+    auto serialize = [] (auto& family) {
+        return serializeFontFamily(family.string());
+    };
+    return makeStringByJoining(m_fontPaletteValuesRule->fontFamilies().map(serialize).span(), ", "_s);
 }
 
 String CSSFontPaletteValuesRule::basePalette() const
@@ -87,9 +89,9 @@ String CSSFontPaletteValuesRule::overrideColors() const
 String CSSFontPaletteValuesRule::cssText() const
 {
     StringBuilder builder;
-    builder.append("@font-palette-values ", m_fontPaletteValuesRule->name(), " { ");
-    if (!m_fontPaletteValuesRule->fontFamily().isNull())
-        builder.append("font-family: ", m_fontPaletteValuesRule->fontFamily(), "; ");
+    builder.append("@font-palette-values ", name(), " { ");
+    if (!m_fontPaletteValuesRule->fontFamilies().isEmpty())
+        builder.append("font-family: ", fontFamily(), "; ");
 
     if (m_fontPaletteValuesRule->basePalette()) {
         switch (m_fontPaletteValuesRule->basePalette()->type) {

diff --git a/Source/WebCore/css/CSSFontSelector.cpp b/Source/WebCore/css/CSSFontSelector.cpp
@@ -245,11 +245,12 @@ void CSSFontSelector::addFontPaletteValuesRule(const StyleRuleFontPaletteValues&
     auto& name = fontPaletteValuesRule.name();
     ASSERT(!name.isNull());
 
-    auto& fontFamily = fontPaletteValuesRule.fontFamily();
-    if (fontFamily.isNull())
+    auto& fontFamilies = fontPaletteValuesRule.fontFamilies();
+    if (fontFamilies.isEmpty())
         return;
 
-    m_paletteMap.set(std::make_pair(fontFamily, name), fontPaletteValuesRule.fontPaletteValues());
+    for (auto& fontFamily : fontFamilies)
+        m_paletteMap.set(std::make_pair(fontFamily, name), fontPaletteValuesRule.fontPaletteValues());
 
     ++m_version;
 }

diff --git a/Source/WebCore/css/CSSProperties.json b/Source/WebCore/css/CSSProperties.json
@@ -9686,13 +9686,13 @@
         "@font-palette-values": {
             "font-family": {
                 "codegen-properties": {
-                    "parser-function": "consumeFamilyName",
-                    "parser-grammar-unused": "<family-name>",
+                    "parser-function": "consumeFamilyNameList",
+                    "parser-grammar-unused": "<family-name>#",
                     "parser-grammar-unused-reason": "Needs support for special 'family-name' processing."
                 },
                 "specification": {
                     "category": "css-fonts-4",
-                    "url": "https://www.w3.org/TR/css-fonts-4/#font-family-2-desc"
+                    "url": "https://drafts.csswg.org/css-fonts-4/#font-family-2-desc"
                 }
             },
             "base-palette": {

diff --git a/Source/WebCore/css/StyleRule.cpp b/Source/WebCore/css/StyleRule.cpp
@@ -411,15 +411,15 @@ Ref<StyleRuleFontFeatureValues> StyleRuleFontFeatureValues::create(const Vector<
     return adoptRef(*new StyleRuleFontFeatureValues(fontFamilies, WTFMove(values)));
 }
 
-Ref<StyleRuleFontPaletteValues> StyleRuleFontPaletteValues::create(const AtomString& name, const AtomString& fontFamily, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors)
+Ref<StyleRuleFontPaletteValues> StyleRuleFontPaletteValues::create(const AtomString& name, Vector<AtomString>&& fontFamilies, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors)
 {
-    return adoptRef(*new StyleRuleFontPaletteValues(name, fontFamily, basePalette, WTFMove(overrideColors)));
+    return adoptRef(*new StyleRuleFontPaletteValues(name, WTFMove(fontFamilies), basePalette, WTFMove(overrideColors)));
 }
 
-StyleRuleFontPaletteValues::StyleRuleFontPaletteValues(const AtomString& name, const AtomString& fontFamily, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors)
+StyleRuleFontPaletteValues::StyleRuleFontPaletteValues(const AtomString& name, Vector<AtomString>&& fontFamilies, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors)
     : StyleRuleBase(StyleRuleType::FontPaletteValues)
     , m_name(name)
-    , m_fontFamily(fontFamily)
+    , m_fontFamilies(WTFMove(fontFamilies))
     , m_fontPaletteValues(basePalette, WTFMove(overrideColors))
 {
 }

diff --git a/Source/WebCore/css/StyleRule.h b/Source/WebCore/css/StyleRule.h
@@ -196,22 +196,22 @@ class StyleRuleFontFace final : public StyleRuleBase {
 
 class StyleRuleFontPaletteValues final : public StyleRuleBase {
 public:
-    static Ref<StyleRuleFontPaletteValues> create(const AtomString& name, const AtomString& fontFamily, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&&);
+    static Ref<StyleRuleFontPaletteValues> create(const AtomString& name, Vector<AtomString>&& fontFamilies, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&&);
 
     const AtomString& name() const { return m_name; }
-    const AtomString& fontFamily() const { return m_fontFamily; }
+    const Vector<AtomString>& fontFamilies() const { return m_fontFamilies; }
     const FontPaletteValues& fontPaletteValues() const { return m_fontPaletteValues; }
     std::optional<FontPaletteIndex> basePalette() const { return m_fontPaletteValues.basePalette(); }
     const Vector<FontPaletteValues::OverriddenColor>& overrideColors() const { return m_fontPaletteValues.overrideColors(); }
 
     Ref<StyleRuleFontPaletteValues> copy() const { return adoptRef(*new StyleRuleFontPaletteValues(*this)); }
 
 private:
-    StyleRuleFontPaletteValues(const AtomString& name, const AtomString& fontFamily, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors);
+    StyleRuleFontPaletteValues(const AtomString& name, Vector<AtomString>&& fontFamilies, std::optional<FontPaletteIndex> basePalette, Vector<FontPaletteValues::OverriddenColor>&& overrideColors);
     StyleRuleFontPaletteValues(const StyleRuleFontPaletteValues&) = default;
 
     AtomString m_name;
-    AtomString m_fontFamily;
+    Vector<AtomString> m_fontFamilies;
     FontPaletteValues m_fontPaletteValues;
 };
 

diff --git a/Source/WebCore/css/parser/CSSParserImpl.cpp b/Source/WebCore/css/parser/CSSParserImpl.cpp
@@ -59,8 +59,10 @@
 #include "StyleRule.h"
 #include "StyleRuleImport.h"
 #include "StyleSheetContents.h"
+#include "css/CSSValueList.h"
 #include <bitset>
 #include <memory>
+#include <optional>
 
 namespace WebCore {
 
@@ -762,7 +764,7 @@ RefPtr<StyleRuleFontFeatureValues> CSSParserImpl::consumeFontFeatureValuesRule(C
     // @font-feature-values <family-name># { <declaration-list> }
 
     auto originalPrelude = prelude;
-    auto fontFamilies = CSSPropertyParserHelpers::consumeFamilyNameList(prelude);
+    auto fontFamilies = CSSPropertyParserHelpers::consumeFamilyNameListRaw(prelude);
     if (fontFamilies.isEmpty() || !prelude.atEnd())
         return nullptr;
 
@@ -811,14 +813,27 @@ RefPtr<StyleRuleFontPaletteValues> CSSParserImpl::consumeFontPaletteValuesRule(C
     auto declarations = consumeDeclarationListInNewNestingContext(block, StyleRuleType::FontPaletteValues);
     auto properties = createStyleProperties(declarations, m_context.mode);
 
-    auto fontFamily = [&] () -> AtomString {
+    auto fontFamilies = [&] {
+        Vector<AtomString> fontFamilies;
+        auto append = [&] (auto& value) {
+            if (value.isFontFamily())
+                fontFamilies.append(AtomString { value.stringValue() });
+        };
         auto cssFontFamily = properties->getPropertyCSSValue(CSSPropertyFontFamily);
         if (!cssFontFamily)
-            return { };
+            return fontFamilies;
+        auto cssPrimitiveFontFamilies = dynamicDowncast<CSSValueList>(*cssFontFamily);
+        if (cssPrimitiveFontFamilies) {
+            for (auto& item : *cssPrimitiveFontFamilies)
+                append(downcast<CSSPrimitiveValue>(item));
+            return fontFamilies;
+        }
+
         auto cssPrimitiveFontFamily = dynamicDowncast<CSSPrimitiveValue>(*cssFontFamily);
-        if (!cssPrimitiveFontFamily || !cssPrimitiveFontFamily->isFontFamily())
-            return { };
-        return AtomString { cssPrimitiveFontFamily->stringValue() };
+        if (!cssPrimitiveFontFamily)
+            return fontFamilies;
+        append(*cssPrimitiveFontFamily);
+        return fontFamilies;
     }();
 
     std::optional<FontPaletteIndex> basePalette;
@@ -845,7 +860,7 @@ RefPtr<StyleRuleFontPaletteValues> CSSParserImpl::consumeFontPaletteValuesRule(C
         }
     }
 
-    return StyleRuleFontPaletteValues::create(AtomString { name->stringValue() }, fontFamily, WTFMove(basePalette), WTFMove(overrideColors));
+    return StyleRuleFontPaletteValues::create(AtomString { name->stringValue() }, WTFMove(fontFamilies), WTFMove(basePalette), WTFMove(overrideColors));
 }
 
 RefPtr<StyleRuleKeyframes> CSSParserImpl::consumeKeyframesRule(CSSParserTokenRange prelude, CSSParserTokenRange block)

diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
@@ -76,6 +76,7 @@
 #include "CSSTimingFunctionValue.h"
 #include "CSSTransformListValue.h"
 #include "CSSUnresolvedColor.h"
+#include "CSSValueKeywords.h"
 #include "CSSValuePair.h"
 #include "CSSValuePool.h"
 #include "CSSVariableData.h"
@@ -4884,7 +4885,7 @@ AtomString consumeFamilyNameRaw(CSSParserTokenRange& range)
     return concatenateFamilyName(range);
 }
 
-Vector<AtomString> consumeFamilyNameList(CSSParserTokenRange& range)
+Vector<AtomString> consumeFamilyNameListRaw(CSSParserTokenRange& range)
 {
     Vector<AtomString> result;
     do {
@@ -5518,6 +5519,13 @@ RefPtr<CSSValue> consumeFamilyName(CSSParserTokenRange& range)
     return CSSValuePool::singleton().createFontFamilyValue(familyName);
 }
 
+RefPtr<CSSValue> consumeFamilyNameList(CSSParserTokenRange& range)
+{
+    return consumeCommaSeparatedListWithoutSingleValueOptimization(range, [] (auto& range) {
+        return consumeFamilyName(range);
+    });
+}
+
 static RefPtr<CSSValue> consumeGenericFamily(CSSParserTokenRange& range)
 {
     return consumeIdentRange(range, CSSValueSerif, CSSValueWebkitBody);

diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.h b/Source/WebCore/css/parser/CSSPropertyParserHelpers.h
@@ -198,7 +198,8 @@ std::optional<CSSValueID> consumeFontStretchKeywordValueRaw(CSSParserTokenRange&
 AtomString concatenateFamilyName(CSSParserTokenRange&);
 AtomString consumeFamilyNameRaw(CSSParserTokenRange&);
 // https://drafts.csswg.org/css-fonts-4/#family-name-value
-Vector<AtomString> consumeFamilyNameList(CSSParserTokenRange&);
+Vector<AtomString> consumeFamilyNameListRaw(CSSParserTokenRange&);
+RefPtr<CSSValue> consumeFamilyNameList(CSSParserTokenRange&);
 std::optional<FontRaw> consumeFontRaw(CSSParserTokenRange&, CSSParserMode);
 const AtomString& genericFontFamily(CSSValueID);
 WebKitFontFamilyNames::FamilyNamesIndex genericFontFamilyIndex(CSSValueID);