<!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>[198004] 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/198004">198004</a></dd>
<dt>Author</dt> <dd>yoav@yoav.ws</dd>
<dt>Date</dt> <dd>2016-03-11 03:13:25 -0800 (Fri, 11 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid applying link tags with an invalid media attribute
https://bugs.webkit.org/show_bug.cgi?id=143262
Reviewed by Brent Fulgham.
Source/WebCore:
In current HTML spec, unlike HTML4, the UA must not apply <link> based resources
when the media attribute does not match:
https://html.spec.whatwg.org/multipage/semantics.html#attr-link-media
An invalid media attribute parsing creates a non-empty MediaQuerySet
containing a single query with no expressions and no media type.
(and with its m_ignored flag off)
In order to ignore such MediaQueries, I added an extra check that makes sure
that the queries handled by MediaQueryEvaluator::eval have either expressions
or a media type, and if not, they are ignored.
Test: fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html
* css/MediaQueryEvaluator.cpp:
(WebCore::MediaQueryEvaluator::eval):
LayoutTests:
These tests make sure that when <link rel=stylesheet> is present with an invalid
media attribute, the styles are not being applied.
* fast/dom/HTMLLinkElement/link-stylesheet-invalid-media-expected.txt: Added.
* fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html: Added.
* fast/dom/HTMLLinkElement/link-stylesheet-media-type-expected.txt: Added.
* fast/dom/HTMLLinkElement/link-stylesheet-media-type.html: Added.
These tests test the old HTML4 behavior and are no longer relevant.
* fast/media/media-descriptor-syntax-05.html: Removed.
* fast/media/media-descriptor-syntax-05-expected.html: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetinvalidmediaexpectedtxt">trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetinvalidmediahtml">trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetmediatypeexpectedtxt">trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetmediatypehtml">trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediamediadescriptorsyntax05expectedhtml">trunk/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmediamediadescriptorsyntax05html">trunk/LayoutTests/fast/media/media-descriptor-syntax-05.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198003 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-11 10:04:35 UTC (rev 198003)
+++ trunk/LayoutTests/ChangeLog 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-11 Yoav Weiss <yoav@yoav.ws>
+
+ Avoid applying link tags with an invalid media attribute
+ https://bugs.webkit.org/show_bug.cgi?id=143262
+
+ Reviewed by Brent Fulgham.
+
+ These tests make sure that when <link rel=stylesheet> is present with an invalid
+ media attribute, the styles are not being applied.
+
+ * fast/dom/HTMLLinkElement/link-stylesheet-invalid-media-expected.txt: Added.
+ * fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html: Added.
+ * fast/dom/HTMLLinkElement/link-stylesheet-media-type-expected.txt: Added.
+ * fast/dom/HTMLLinkElement/link-stylesheet-media-type.html: Added.
+
+ These tests test the old HTML4 behavior and are no longer relevant.
+ * fast/media/media-descriptor-syntax-05.html: Removed.
+ * fast/media/media-descriptor-syntax-05-expected.html: Removed.
+
</ins><span class="cx"> 2016-03-11 Frederic Wang <fwang@igalia.com>
</span><span class="cx">
</span><span class="cx"> Skip content-editable-as-textarea.html on GTK as it uses AX API.
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetinvalidmediaexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media-expected.txt (0 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media-expected.txt 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+SUCCESS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetinvalidmediahtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html (0 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<link rel=stylesheet href="data:text/css,#test { width: 100px }" media="(width invalid)">
+<div id=result></div>
+<div id=test></div>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ var test = document.getElementById("test");
+ var result = document.getElementById("result");
+ if (test.offsetWidth == 100)
+ result.innerHTML = "FAILURE";
+ else
+ result.innerHTML = "SUCCESS";
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetmediatypeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type-expected.txt (0 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type-expected.txt 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+SUCCESS
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomHTMLLinkElementlinkstylesheetmediatypehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type.html (0 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type.html (rev 0)
+++ trunk/LayoutTests/fast/dom/HTMLLinkElement/link-stylesheet-media-type.html 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<!DOCTYPE html>
+<link rel=stylesheet href="data:text/css,#test { width: 100px }" media="screen">
+<div id=result></div>
+<div id=test></div>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ var test = document.getElementById("test");
+ var result = document.getElementById("result");
+ if (test.offsetWidth == 100)
+ result.innerHTML = "SUCCESS";
+ else
+ result.innerHTML = "FAILURE";
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediamediadescriptorsyntax05expectedhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html (198003 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html 2016-03-11 10:04:35 UTC (rev 198003)
+++ trunk/LayoutTests/fast/media/media-descriptor-syntax-05-expected.html 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -1,5 +0,0 @@
</span><del>-<html>
-<body>
-<p style="color: green">This text should be green.</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastmediamediadescriptorsyntax05html"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/media/media-descriptor-syntax-05.html (198003 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/media/media-descriptor-syntax-05.html 2016-03-11 10:04:35 UTC (rev 198003)
+++ trunk/LayoutTests/fast/media/media-descriptor-syntax-05.html 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-<html>
-<head>
-<title>HTML4 media descriptor test: parsing style element media attribute, forward-compatible syntax</title>
-<link rel="help" href="http://www.w3.org/TR/REC-html40/types.html#h-6.13" />
-<style type="text/css" media="*****|{}- |[|">
-p { color: green }
-</style>
-
-</head>
-<body>
-<p> This text should be green.</p>
-</body>
-</html>
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198003 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-11 10:04:35 UTC (rev 198003)
+++ trunk/Source/WebCore/ChangeLog 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-03-11 Yoav Weiss <yoav@yoav.ws>
+
+ Avoid applying link tags with an invalid media attribute
+ https://bugs.webkit.org/show_bug.cgi?id=143262
+
+ Reviewed by Brent Fulgham.
+
+ In current HTML spec, unlike HTML4, the UA must not apply <link> based resources
+ when the media attribute does not match:
+ https://html.spec.whatwg.org/multipage/semantics.html#attr-link-media
+
+ An invalid media attribute parsing creates a non-empty MediaQuerySet
+ containing a single query with no expressions and no media type.
+ (and with its m_ignored flag off)
+
+ In order to ignore such MediaQueries, I added an extra check that makes sure
+ that the queries handled by MediaQueryEvaluator::eval have either expressions
+ or a media type, and if not, they are ignored.
+
+ Test: fast/dom/HTMLLinkElement/link-stylesheet-invalid-media.html
+
+ * css/MediaQueryEvaluator.cpp:
+ (WebCore::MediaQueryEvaluator::eval):
+
</ins><span class="cx"> 2016-03-11 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [CallWith=ScriptExecutionContext] should pass ScriptExecutionContext to the implementation by reference
</span></span></pre></div>
<a id="trunkSourceWebCorecssMediaQueryEvaluatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/MediaQueryEvaluator.cpp (198003 => 198004)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2016-03-11 10:04:35 UTC (rev 198003)
+++ trunk/Source/WebCore/css/MediaQueryEvaluator.cpp 2016-03-11 11:13:25 UTC (rev 198004)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> for (size_t i = 0; i < queries.size() && !result; ++i) {
</span><span class="cx"> MediaQuery* query = queries[i].get();
</span><span class="cx">
</span><del>- if (query->ignored())
</del><ins>+ if (query->ignored() || (!query->expressions().size() && query->mediaType().isEmpty()))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> if (mediaTypeMatch(query->mediaType())) {
</span></span></pre>
</div>
</div>
</body>
</html>