<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[283756] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/283756">283756</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2021-10-07 16:37:01 -0700 (Thu, 07 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Shadowing of @font-palette-values rules doesn't work
https://bugs.webkit.org/show_bug.cgi?id=231218
<rdar://problem/83872258>

Reviewed by Wenson Hsieh.

LayoutTests/imported/w3c:

* web-platform-tests/css/css-fonts/font-palette-32-expected.html: Added.
* web-platform-tests/css/css-fonts/font-palette-32.html: Added.

Source/WebCore:

https://drafts.csswg.org/css-fonts-4/#font-palette-values says:
> When a given descriptor occurs multiple times in a given @font-palette-values rule,
> only the last descriptor declaration is used.

Test: imported/w3c/web-platform-tests/css/css-fonts/font-palette-32.html

* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::buildStarted):
(WebCore::CSSFontSelector::addFontPaletteValuesRule):
(WebCore::CSSFontSelector::lookupFontPaletteValues):
* css/CSSFontSelector.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorcpp">trunk/Source/WebCore/css/CSSFontSelector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontSelectorh">trunk/Source/WebCore/css/CSSFontSelector.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssfontsfontpalette32expectedhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32-expected.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssfontsfontpalette32html">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (283755 => 283756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-10-07 23:30:56 UTC (rev 283755)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-10-07 23:37:01 UTC (rev 283756)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2021-10-07  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><ins>+        Shadowing of @font-palette-values rules doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=231218
+        <rdar://problem/83872258>
+
+        Reviewed by Wenson Hsieh.
+
+        * web-platform-tests/css/css-fonts/font-palette-32-expected.html: Added.
+        * web-platform-tests/css/css-fonts/font-palette-32.html: Added.
+
+2021-10-07  Myles C. Maxfield  <mmaxfield@apple.com>
+
</ins><span class="cx">         Stop parsing font palette things that we can't implement
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=230799
</span><span class="cx">         <rdar://problem/83537772>
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssfontsfontpalette32expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32-expected.html (0 => 283756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32-expected.html                            (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32-expected.html       2021-10-07 23:37:01 UTC (rev 283756)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Tests for font-palette 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="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com">
+<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 id="target" style="font: 48px 'COLR-test-font'; font-palette: --MyPalette">A</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssfontsfontpalette32html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32.html (0 => 283756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32.html                             (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/font-palette-32.html        2021-10-07 23:37:01 UTC (rev 283756)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Tests for font-palette 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="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com">
+<link rel="match" href="font-palette-32-ref.html">
+<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: 1;
+}
+
+@font-palette-values --MyPalette {
+    font-family: "COLR-test-font";
+    base-palette: 2;
+}
+</style>
+</head>
+<body>
+<div id="target" style="font: 48px 'COLR-test-font'; font-palette: --MyPalette;">A</div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283755 => 283756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-07 23:30:56 UTC (rev 283755)
+++ trunk/Source/WebCore/ChangeLog      2021-10-07 23:37:01 UTC (rev 283756)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2021-10-07  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Shadowing of @font-palette-values rules doesn't work
+        https://bugs.webkit.org/show_bug.cgi?id=231218
+        <rdar://problem/83872258>
+
+        Reviewed by Wenson Hsieh.
+
+        https://drafts.csswg.org/css-fonts-4/#font-palette-values says:
+        > When a given descriptor occurs multiple times in a given @font-palette-values rule,
+        > only the last descriptor declaration is used.
+
+        Test: imported/w3c/web-platform-tests/css/css-fonts/font-palette-32.html
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::buildStarted):
+        (WebCore::CSSFontSelector::addFontPaletteValuesRule):
+        (WebCore::CSSFontSelector::lookupFontPaletteValues):
+        * css/CSSFontSelector.h:
+
</ins><span class="cx"> 2021-10-07  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Do not check for firstLineStyle while constructing RenderText
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.cpp (283755 => 283756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.cpp     2021-10-07 23:30:56 UTC (rev 283755)
+++ trunk/Source/WebCore/css/CSSFontSelector.cpp        2021-10-07 23:37:01 UTC (rev 283756)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx">             m_cssConnectionsPossiblyToRemove.add(&face);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    m_paletteFamilyMap.clear();
</del><ins>+    m_paletteMap.clear();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void CSSFontSelector::buildCompleted()
</span><span class="lines">@@ -235,9 +235,7 @@
</span><span class="cx"> {
</span><span class="cx">     AtomString fontFamily = fontPaletteValuesRule.fontFamily().isNull() ? emptyAtom() : fontPaletteValuesRule.fontFamily();
</span><span class="cx">     AtomString name = fontPaletteValuesRule.name().isNull() ? emptyAtom() : fontPaletteValuesRule.name();
</span><del>-    m_paletteFamilyMap.ensure(std::make_pair(fontFamily, name), [&] () {
-        return fontPaletteValuesRule.fontPaletteValues();
-    });
</del><ins>+    m_paletteMap.set(std::make_pair(fontFamily, name), fontPaletteValuesRule.fontPaletteValues());
</ins><span class="cx"> 
</span><span class="cx">     ++m_version;
</span><span class="cx"> }
</span><span class="lines">@@ -325,8 +323,8 @@
</span><span class="cx"> 
</span><span class="cx">     const AtomString paletteName = fontDescription.fontPalette().identifier;
</span><span class="cx"> 
</span><del>-    auto iterator = m_paletteFamilyMap.find(std::make_pair(familyName, paletteName));
-    if (iterator == m_paletteFamilyMap.end())
</del><ins>+    auto iterator = m_paletteMap.find(std::make_pair(familyName, paletteName));
+    if (iterator == m_paletteMap.end())
</ins><span class="cx">         return emptyFontPaletteValues.get();
</span><span class="cx">     return iterator->value;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontSelectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontSelector.h (283755 => 283756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontSelector.h       2021-10-07 23:30:56 UTC (rev 283755)
+++ trunk/Source/WebCore/css/CSSFontSelector.h  2021-10-07 23:37:01 UTC (rev 283756)
</span><span class="lines">@@ -128,7 +128,7 @@
</span><span class="cx">     Ref<CSSFontFaceSet> m_cssFontFaceSet;
</span><span class="cx">     HashSet<FontSelectorClient*> m_clients;
</span><span class="cx"> 
</span><del>-    HashMap<std::pair<AtomString, AtomString>, FontPaletteValues> m_paletteFamilyMap;
</del><ins>+    HashMap<std::pair<AtomString, AtomString>, FontPaletteValues> m_paletteMap;
</ins><span class="cx"> 
</span><span class="cx">     HashSet<RefPtr<CSSFontFace>> m_cssConnectionsPossiblyToRemove;
</span><span class="cx">     HashSet<RefPtr<StyleRuleFontFace>> m_cssConnectionsEncounteredDuringBuild;
</span></span></pre>
</div>
</div>

</body>
</html>