<!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>[207176] 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/207176">207176</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2016-10-11 16:20:39 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>color-gamut media query shouldn't ASSERT on invalid values
https://bugs.webkit.org/show_bug.cgi?id=163303
<rdar://problem/28724566>
Reviewed by Simon Fraser.
Source/WebCore:
Remove the ASSERT_NOT_REACHED in the evaluation, since it
can be hit when there is a valid CSS keyword that is not
expected in the query.
Updated fast/media/mq-color-gamut.html
* css/MediaQueryEvaluator.cpp:
(WebCore::colorGamutEvaluate):
LayoutTests:
Add a 'none' test.
* fast/media/mq-color-gamut-expected.html:
* fast/media/mq-color-gamut.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediamqcolorgamutexpectedhtml">trunk/LayoutTests/fast/media/mq-color-gamut-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmediamqcolorgamuthtml">trunk/LayoutTests/fast/media/mq-color-gamut.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssMediaQueryEvaluatorcpp">trunk/Source/WebCore/css/MediaQueryEvaluator.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207175 => 207176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-10-11 23:11:49 UTC (rev 207175)
+++ trunk/LayoutTests/ChangeLog        2016-10-11 23:20:39 UTC (rev 207176)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-10-11 Dean Jackson <dino@apple.com>
+
+ color-gamut media query shouldn't ASSERT on invalid values
+ https://bugs.webkit.org/show_bug.cgi?id=163303
+ <rdar://problem/28724566>
+
+ Reviewed by Simon Fraser.
+
+ Add a 'none' test.
+
+ * fast/media/mq-color-gamut-expected.html:
+ * fast/media/mq-color-gamut.html:
+
</ins><span class="cx"> 2016-10-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update MediaStream events to stop using legacy [ConstructorTemplate=Event]
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediamqcolorgamutexpectedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/media/mq-color-gamut-expected.html (207175 => 207176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/media/mq-color-gamut-expected.html        2016-10-11 23:11:49 UTC (rev 207175)
+++ trunk/LayoutTests/fast/media/mq-color-gamut-expected.html        2016-10-11 23:20:39 UTC (rev 207176)
</span><span class="lines">@@ -4,11 +4,13 @@
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> #a { background-color: green; color: white; }
</span><span class="cx"> #b { background-color: green; color: white; }
</span><ins>+#c { background-color: green; color: white; }
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="a">This paragraph should have a green background.</p>
</span><span class="cx"> <p id="b">This paragraph should have a blue background on a device with a display that supports something close to P3. Otherwise the background should be green.</p>
</span><ins>+ <p id="c">This paragraph should have a green background.</p>
</ins><span class="cx"> <p>Note that the expected results of this test assume a display that is not significantly wider than sRGB.</p>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediamqcolorgamuthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/media/mq-color-gamut.html (207175 => 207176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/media/mq-color-gamut.html        2016-10-11 23:11:49 UTC (rev 207175)
+++ trunk/LayoutTests/fast/media/mq-color-gamut.html        2016-10-11 23:20:39 UTC (rev 207176)
</span><span class="lines">@@ -4,15 +4,20 @@
</span><span class="cx"> <style type="text/css">
</span><span class="cx"> #a { background-color: green; color: white; }
</span><span class="cx"> #b { background-color: green; color: white; }
</span><ins>+#c { background-color: green; color: white; }
</ins><span class="cx">
</span><span class="cx"> @media (color-gamut: p3) {
</span><span class="cx"> #b { background-color: blue; }
</span><span class="cx"> }
</span><ins>+@media (color-gamut: none) {
+#b { background-color: blue; }
+}
</ins><span class="cx"> </style>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><span class="cx"> <p id="a">This paragraph should have a green background.</p>
</span><span class="cx"> <p id="b">This paragraph should have a blue background on a device with a display that supports something close to P3. Otherwise the background should be green.</p>
</span><ins>+ <p id="c">This paragraph should have a green background.</p>
</ins><span class="cx"> <p>Note that the expected results of this test assume a display that is not significantly wider than sRGB.</p>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207175 => 207176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-10-11 23:11:49 UTC (rev 207175)
+++ trunk/Source/WebCore/ChangeLog        2016-10-11 23:20:39 UTC (rev 207176)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-11 Dean Jackson <dino@apple.com>
+
+ color-gamut media query shouldn't ASSERT on invalid values
+ https://bugs.webkit.org/show_bug.cgi?id=163303
+ <rdar://problem/28724566>
+
+ Reviewed by Simon Fraser.
+
+ Remove the ASSERT_NOT_REACHED in the evaluation, since it
+ can be hit when there is a valid CSS keyword that is not
+ expected in the query.
+
+ Updated fast/media/mq-color-gamut.html
+
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::colorGamutEvaluate):
+
</ins><span class="cx"> 2016-10-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update MediaStream events to stop using legacy [ConstructorTemplate=Event]
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (207175 => 207176)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp        2016-10-11 23:11:49 UTC (rev 207175)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp        2016-10-11 23:20:39 UTC (rev 207176)
</span><span class="lines">@@ -255,7 +255,6 @@
</span><span class="cx"> // FIXME: At some point we should start detecting displays that support more colors.
</span><span class="cx"> return false;
</span><span class="cx"> default:
</span><del>- ASSERT_NOT_REACHED();
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>