<!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>[278262] 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/278262">278262</a></dd>
<dt>Author</dt> <dd>weinig@apple.com</dd>
<dt>Date</dt> <dd>2021-05-30 17:52:19 -0700 (Sun, 30 May 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add additional target luminance keywords for color-contrast() added for https://github.com/w3c/csswg-drafts/issues/6311
https://bugs.webkit.org/show_bug.cgi?id=226438

Reviewed by Chris Dumez.

Source/WebCore:

Add newly spec'd target luminance keywords.

* css/CSSValueKeywords.in:
Add AAA and AAA-large keywords.

* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::parseColorContrastFunctionParameters):
Add target luminance mappings for "AAA" -> 7 and "AAA-large" -> 4.5

LayoutTests:

Update test and results for new AAA and AAA-large target luminance keywords.

* fast/css/parsing-color-contrast-expected.txt:
* fast/css/parsing-color-contrast.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingcolorcontrastexpectedtxt">trunk/LayoutTests/fast/css/parsing-color-contrast-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastcssparsingcolorcontrasthtml">trunk/LayoutTests/fast/css/parsing-color-contrast.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSValueKeywordsin">trunk/Source/WebCore/css/CSSValueKeywords.in</a></li>
<li><a href="#trunkSourceWebCorecssparserCSSPropertyParserHelperscpp">trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278261 => 278262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-05-31 00:29:18 UTC (rev 278261)
+++ trunk/LayoutTests/ChangeLog 2021-05-31 00:52:19 UTC (rev 278262)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2021-05-30  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><ins>+        Add additional target luminance keywords for color-contrast() added for https://github.com/w3c/csswg-drafts/issues/6311
+        https://bugs.webkit.org/show_bug.cgi?id=226438
+
+        Reviewed by Chris Dumez.
+
+        Update test and results for new AAA and AAA-large target luminance keywords.
+
+        * fast/css/parsing-color-contrast-expected.txt:
+        * fast/css/parsing-color-contrast.html:
+
+2021-05-30  Sam Weinig  <weinig@apple.com>
+
</ins><span class="cx">         Support calc() on components inside relative color syntax colors
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=226272
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingcolorcontrastexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/parsing-color-contrast-expected.txt (278261 => 278262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-color-contrast-expected.txt   2021-05-31 00:29:18 UTC (rev 278261)
+++ trunk/LayoutTests/fast/css/parsing-color-contrast-expected.txt      2021-05-31 00:52:19 UTC (rev 278262)
</span><span class="lines">@@ -20,6 +20,8 @@
</span><span class="cx"> Test with specified target contrast
</span><span class="cx"> PASS computedStyle("background-color", "color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AA)") is "rgb(0, 100, 0)"
</span><span class="cx"> PASS computedStyle("background-color", "color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AA-large)") is "rgb(128, 128, 0)"
</span><ins>+PASS computedStyle("background-color", "color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AAA)") is "rgb(128, 0, 0)"
+PASS computedStyle("background-color", "color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AAA-large)") is "rgb(0, 100, 0)"
</ins><span class="cx"> PASS computedStyle("background-color", "color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to 5.8)") is "rgb(128, 0, 0)"
</span><span class="cx"> 
</span><span class="cx"> Test with specified target contrast that none meet
</span></span></pre></div>
<a id="trunkLayoutTestsfastcssparsingcolorcontrasthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/css/parsing-color-contrast.html (278261 => 278262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/css/parsing-color-contrast.html   2021-05-31 00:29:18 UTC (rev 278261)
+++ trunk/LayoutTests/fast/css/parsing-color-contrast.html      2021-05-31 00:52:19 UTC (rev 278262)
</span><span class="lines">@@ -47,7 +47,9 @@
</span><span class="cx"> 
</span><span class="cx">     testComputed(`color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AA)`, `rgb(0, 100, 0)`); // darkgreen
</span><span class="cx">     testComputed(`color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AA-large)`, `rgb(128, 128, 0)`); // olive
</span><del>-    testComputed(`color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to 5.8)`, `rgb(128, 0, 0)`); // olive maroon
</del><ins>+    testComputed(`color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AAA)`, `rgb(128, 0, 0)`); // maroon
+    testComputed(`color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to AAA-large)`, `rgb(0, 100, 0)`); // darkgreen
+    testComputed(`color-contrast(wheat vs bisque, darkgoldenrod, olive, sienna, darkgreen, maroon to 5.8)`, `rgb(128, 0, 0)`); // maroon
</ins><span class="cx">     
</span><span class="cx">     debug('');
</span><span class="cx">     debug('Test with specified target contrast that none meet')
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278261 => 278262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-05-31 00:29:18 UTC (rev 278261)
+++ trunk/Source/WebCore/ChangeLog      2021-05-31 00:52:19 UTC (rev 278262)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2021-05-30  Sam Weinig  <weinig@apple.com>
</span><span class="cx"> 
</span><ins>+        Add additional target luminance keywords for color-contrast() added for https://github.com/w3c/csswg-drafts/issues/6311
+        https://bugs.webkit.org/show_bug.cgi?id=226438
+
+        Reviewed by Chris Dumez.
+
+        Add newly spec'd target luminance keywords. 
+
+        * css/CSSValueKeywords.in:
+        Add AAA and AAA-large keywords.
+
+        * css/parser/CSSPropertyParserHelpers.cpp:
+        (WebCore::CSSPropertyParserHelpers::parseColorContrastFunctionParameters):
+        Add target luminance mappings for "AAA" -> 7 and "AAA-large" -> 4.5
+
+2021-05-30  Sam Weinig  <weinig@apple.com>
+
</ins><span class="cx">         Support calc() on components inside relative color syntax colors
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=226272
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSValueKeywordsin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (278261 => 278262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSValueKeywords.in     2021-05-31 00:29:18 UTC (rev 278261)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in        2021-05-31 00:52:19 UTC (rev 278262)
</span><span class="lines">@@ -1448,6 +1448,8 @@
</span><span class="cx"> vs
</span><span class="cx"> AA
</span><span class="cx"> AA-large
</span><ins>+AAA
+AAA-large
</ins><span class="cx"> 
</span><span class="cx"> // color-mix()
</span><span class="cx"> color-mix
</span></span></pre></div>
<a id="trunkSourceWebCorecssparserCSSPropertyParserHelperscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp (278261 => 278262)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp     2021-05-31 00:29:18 UTC (rev 278261)
+++ trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp        2021-05-31 00:52:19 UTC (rev 278262)
</span><span class="lines">@@ -1736,12 +1736,23 @@
</span><span class="cx">     if (colorsToCompareAgainst.size() == 1)
</span><span class="cx">         return { };
</span><span class="cx"> 
</span><ins>+    constexpr std::pair<CSSValueID, double> targetLuminanceMappings[] {
+        { CSSValueAA, 4.5 },
+        { CSSValueAALarge, 3.0 },
+        { CSSValueAAA, 7.0 },
+        { CSSValueAAALarge, 4.5 },
+    };
+
</ins><span class="cx">     if (consumedTo) {
</span><span class="cx">         auto targetContrast = [&] () -> std::optional<double> {
</span><del>-            if (consumeIdentRaw<CSSValueAA>(args))
-                return 4.5;
-            if (consumeIdentRaw<CSSValueAALarge>(args))
-                return 3.0;
</del><ins>+            if (args.peek().type() == IdentToken) {
+                auto id = args.consumeIncludingWhitespace().id();
+                for (auto& [identifier, luminance] : targetLuminanceMappings) {
+                    if (identifier == id)
+                        return luminance;
+                }
+                return std::nullopt;
+            }
</ins><span class="cx">             return consumeNumberRaw(args);
</span><span class="cx">         }();
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>