<!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>[211926] 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/211926">211926</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-08 18:50:00 -0800 (Wed, 08 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>HTML Link elements should load data URLs as same origin
https://bugs.webkit.org/show_bug.cgi?id=168032
<rdar://problem/30275036>
Patch by Youenn Fablet <youennf@gmail.com> on 2017-02-08
Reviewed by Alex Christensen.
Source/WebCore:
Test: fast/dom/data-url-css-link-element-cors-active.html
Making CSS data URLs resources considered as same origin when loaded through link elements.
In the future, we should consider remove the data URL same origin flag and fully align with the fetch and HTML spec.
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::process):
LayoutTests:
* fast/dom/data-url-css-link-element-cors-active-expected.txt: Added.
* fast/dom/data-url-css-link-element-cors-active.html: Added.</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="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastdomdataurlcsslinkelementcorsactiveexpectedtxt">trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastdomdataurlcsslinkelementcorsactivehtml">trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (211925 => 211926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-09 02:13:51 UTC (rev 211925)
+++ trunk/LayoutTests/ChangeLog 2017-02-09 02:50:00 UTC (rev 211926)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-02-08 Youenn Fablet <youennf@gmail.com>
+
+ HTML Link elements should load data URLs as same origin
+ https://bugs.webkit.org/show_bug.cgi?id=168032
+ <rdar://problem/30275036>
+
+ Reviewed by Alex Christensen.
+
+ * fast/dom/data-url-css-link-element-cors-active-expected.txt: Added.
+ * fast/dom/data-url-css-link-element-cors-active.html: Added.
+
</ins><span class="cx"> 2017-02-08 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r193286): Promise chain no longer prevent UI refresh
</span></span></pre></div>
<a id="trunkLayoutTestsfastdomdataurlcsslinkelementcorsactiveexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active-expected.txt (0 => 211926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active-expected.txt 2017-02-09 02:50:00 UTC (rev 211926)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This test tries to load a CSS link data URL with CORS activated.
+
+PASS
</ins></span></pre></div>
<a id="trunkLayoutTestsfastdomdataurlcsslinkelementcorsactivehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active.html (0 => 211926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active.html (rev 0)
+++ trunk/LayoutTests/fast/dom/data-url-css-link-element-cors-active.html 2017-02-09 02:50:00 UTC (rev 211926)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<body>
+<script>
+function log(message)
+{
+ document.getElementById("log").innerHTML = message;
+ if (window.testRunner)
+ testRunner.notifyDone();
+}
+
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+</script>
+<html>
+ <p>This test tries to load a CSS link data URL with CORS activated.</p>
+<link href="data:text/css,.picture%20%7B%20background%3A%20none%3B%20%7D" crossOrigin="anonymous" rel="stylesheet" onload="log('PASS')" onerror="log('FAIL')">
+<p>
+<p id="log"></p>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (211925 => 211926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-09 02:13:51 UTC (rev 211925)
+++ trunk/Source/WebCore/ChangeLog 2017-02-09 02:50:00 UTC (rev 211926)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-08 Youenn Fablet <youennf@gmail.com>
+
+ HTML Link elements should load data URLs as same origin
+ https://bugs.webkit.org/show_bug.cgi?id=168032
+ <rdar://problem/30275036>
+
+ Reviewed by Alex Christensen.
+
+ Test: fast/dom/data-url-css-link-element-cors-active.html
+
+ Making CSS data URLs resources considered as same origin when loaded through link elements.
+ In the future, we should consider remove the data URL same origin flag and fully align with the fetch and HTML spec.
+
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::process):
+
</ins><span class="cx"> 2017-02-08 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r193286): Promise chain no longer prevent UI refresh
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (211925 => 211926)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2017-02-09 02:13:51 UTC (rev 211925)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2017-02-09 02:50:00 UTC (rev 211926)
</span><span class="lines">@@ -266,14 +266,15 @@
</span><span class="cx"> std::optional<ResourceLoadPriority> priority;
</span><span class="cx"> if (!isActive)
</span><span class="cx"> priority = ResourceLoadPriority::VeryLow;
</span><del>- CachedResourceRequest request(url, CachedResourceLoader::defaultCachedResourceOptions(), priority, WTFMove(charset));
</del><ins>+
+ ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
+ options.sameOriginDataURLFlag = SameOriginDataURLFlag::Set;
+ if (document().contentSecurityPolicy()->allowStyleWithNonce(attributeWithoutSynchronization(HTMLNames::nonceAttr)))
+ options.contentSecurityPolicyImposition = ContentSecurityPolicyImposition::SkipPolicyCheck;
+
+ CachedResourceRequest request(url, options, priority, WTFMove(charset));
</ins><span class="cx"> request.setInitiator(*this);
</span><span class="cx">
</span><del>- if (document().contentSecurityPolicy()->allowStyleWithNonce(attributeWithoutSynchronization(HTMLNames::nonceAttr))) {
- ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
- options.contentSecurityPolicyImposition = ContentSecurityPolicyImposition::SkipPolicyCheck;
- request.setOptions(options);
- }
</del><span class="cx"> request.setAsPotentiallyCrossOrigin(crossOrigin(), document());
</span><span class="cx">
</span><span class="cx"> m_cachedSheet = document().cachedResourceLoader().requestCSSStyleSheet(WTFMove(request));
</span></span></pre>
</div>
</div>
</body>
</html>