<!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>[244413] 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/244413">244413</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2019-04-17 16:55:47 -0700 (Wed, 17 Apr 2019)</dd>
</dl>
<h3>Log Message</h3>
<pre>Standardize the `<meta name="color-scheme">` separator.
https://bugs.webkit.org/show_bug.cgi?id=193931
Reviewed by Simon Fraser.
Source/WebCore:
Drop support for comma as a valid seperator in <meta name="color-scheme"> to
match the proposal being tracked by: https://github.com/whatwg/html/issues/4504
Tests: css-dark-mode/color-scheme-meta.html
css-dark-mode/older-syntax/supported-color-schemes-meta.html
* dom/Document.cpp:
(WebCore::isColorSchemeSeparator): Drop support for comma.
LayoutTests:
* css-dark-mode/color-scheme-meta-expected.txt:
* css-dark-mode/color-scheme-meta.html:
* css-dark-mode/older-syntax/supported-color-scheme-meta-expected.txt:
* css-dark-mode/older-syntax/supported-color-schemes-meta.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscssdarkmodecolorschememetaexpectedtxt">trunk/LayoutTests/css-dark-mode/color-scheme-meta-expected.txt</a></li>
<li><a href="#trunkLayoutTestscssdarkmodecolorschememetahtml">trunk/LayoutTests/css-dark-mode/color-scheme-meta.html</a></li>
<li><a href="#trunkLayoutTestscssdarkmodeoldersyntaxsupportedcolorschemesmetaexpectedtxt">trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt</a></li>
<li><a href="#trunkLayoutTestscssdarkmodeoldersyntaxsupportedcolorschemesmetahtml">trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/LayoutTests/ChangeLog 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2019-04-17 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Standardize the `<meta name="color-scheme">` separator.
+ https://bugs.webkit.org/show_bug.cgi?id=193931
+
+ Reviewed by Simon Fraser.
+
+ * css-dark-mode/color-scheme-meta-expected.txt:
+ * css-dark-mode/color-scheme-meta.html:
+ * css-dark-mode/older-syntax/supported-color-scheme-meta-expected.txt:
+ * css-dark-mode/older-syntax/supported-color-schemes-meta.html:
+
+2019-04-17 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Rename `supported-color-schemes` to `color-scheme`.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=197016
</span><span class="cx"> rdar://problem/49980259
</span></span></pre></div>
<a id="trunkLayoutTestscssdarkmodecolorschememetaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css-dark-mode/color-scheme-meta-expected.txt (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css-dark-mode/color-scheme-meta-expected.txt 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/LayoutTests/css-dark-mode/color-scheme-meta-expected.txt 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> PASS Element colors are correct in dark color scheme with only light color scheme
</span><span class="cx"> PASS Color schemes changed to empty value
</span><span class="cx"> PASS Element colors are correct in dark color scheme with implicit light color scheme
</span><del>-PASS Color schemes changed to light and dark
-PASS Element colors are correct in dark color scheme with light and dark color scheme
</del><ins>+PASS Color schemes changed to light,dark
+PASS Element colors are in light color scheme since comma is not an allowed seperator
</ins><span class="cx"> PASS Color schemes changed to a bogus value and dark
</span><span class="cx"> PASS Element colors are correct in dark color scheme with dark color scheme
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscssdarkmodecolorschememetahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css-dark-mode/color-scheme-meta.html (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css-dark-mode/color-scheme-meta.html 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/LayoutTests/css-dark-mode/color-scheme-meta.html 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> }, "Element colors are correct in dark color scheme with only dark color scheme");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- document.getElementById("meta").content = "light ,foo ";
</del><ins>+ document.getElementById("meta").content = "light foo ";
</ins><span class="cx"> }, "Color schemes changed to light and a bogus value");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="lines">@@ -110,16 +110,16 @@
</span><span class="cx"> }, "Element colors are correct in dark color scheme with implicit light color scheme");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- document.getElementById("meta").content = " light, dark ";
-}, "Color schemes changed to light and dark");
</del><ins>+ document.getElementById("meta").content = " light,dark ";
+}, "Color schemes changed to light,dark");
</ins><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- // The semantic text color should be white now.
- test_color_is_white("test1");
-}, "Element colors are correct in dark color scheme with light and dark color scheme");
</del><ins>+ // The semantic text color should be black now.
+ test_color_is_black("test1");
+}, "Element colors are in light color scheme since comma is not an allowed seperator");
</ins><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- document.getElementById("meta").content = ", foo dark";
</del><ins>+ document.getElementById("meta").content = " foo dark";
</ins><span class="cx"> }, "Color schemes changed to a bogus value and dark");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span></span></pre></div>
<a id="trunkLayoutTestscssdarkmodeoldersyntaxsupportedcolorschemesmetaexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta-expected.txt 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -16,8 +16,8 @@
</span><span class="cx"> PASS Element colors are correct in dark color scheme with only light color scheme
</span><span class="cx"> PASS Supported color schemes changed to empty value
</span><span class="cx"> PASS Element colors are correct in dark color scheme with implicit light color scheme
</span><del>-PASS Supported color schemes changed to light and dark
-PASS Element colors are correct in dark color scheme with light and dark color scheme
</del><ins>+PASS Supported color schemes changed to light,dark
+PASS Element colors are in light color scheme since comma is not an allowed seperator
</ins><span class="cx"> PASS Supported color schemes changed to a bogus value and dark
</span><span class="cx"> PASS Element colors are correct in dark color scheme with dark color scheme
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestscssdarkmodeoldersyntaxsupportedcolorschemesmetahtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta.html (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta.html 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/LayoutTests/css-dark-mode/older-syntax/supported-color-schemes-meta.html 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -110,16 +110,16 @@
</span><span class="cx"> }, "Element colors are correct in dark color scheme with implicit light color scheme");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- document.getElementById("meta").content = " light, dark ";
-}, "Supported color schemes changed to light and dark");
</del><ins>+ document.getElementById("meta").content = " light,dark ";
+}, "Supported color schemes changed to light,dark");
</ins><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- // The semantic text color should be white now.
- test_color_is_white("test1");
-}, "Element colors are correct in dark color scheme with light and dark color scheme");
</del><ins>+ // The semantic text color should be black now.
+ test_color_is_black("test1");
+}, "Element colors are in light color scheme since comma is not an allowed seperator");
</ins><span class="cx">
</span><span class="cx"> test(function() {
</span><del>- document.getElementById("meta").content = ", foo dark";
</del><ins>+ document.getElementById("meta").content = " foo dark";
</ins><span class="cx"> }, "Supported color schemes changed to a bogus value and dark");
</span><span class="cx">
</span><span class="cx"> test(function() {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/Source/WebCore/ChangeLog 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2019-04-17 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Standardize the `<meta name="color-scheme">` separator.
+ https://bugs.webkit.org/show_bug.cgi?id=193931
+
+ Reviewed by Simon Fraser.
+
+ Drop support for comma as a valid seperator in <meta name="color-scheme"> to
+ match the proposal being tracked by: https://github.com/whatwg/html/issues/4504
+
+ Tests: css-dark-mode/color-scheme-meta.html
+ css-dark-mode/older-syntax/supported-color-schemes-meta.html
+
+ * dom/Document.cpp:
+ (WebCore::isColorSchemeSeparator): Drop support for comma.
+
+2019-04-17 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Rename `supported-color-schemes` to `color-scheme`.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=197016
</span><span class="cx"> rdar://problem/49980259
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (244412 => 244413)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2019-04-17 23:47:16 UTC (rev 244412)
+++ trunk/Source/WebCore/dom/Document.cpp 2019-04-17 23:55:47 UTC (rev 244413)
</span><span class="lines">@@ -3616,9 +3616,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DARK_MODE_CSS)
</span><del>-static bool isColorSchemeSeparator(UChar character)
</del><ins>+static inline bool isColorSchemeSeparator(UChar character)
</ins><span class="cx"> {
</span><del>- return isASCIISpace(character) || character == ',';
</del><ins>+ return isASCIISpace(character);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void processColorSchemeString(StringView colorScheme, const WTF::Function<void(StringView key)>& callback)
</span></span></pre>
</div>
</div>
</body>
</html>