<!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>[195095] releases/WebKitGTK/webkit-2.10</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/195095">195095</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 00:26:42 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192969">r192969</a> - Fix preloader issue with srcdoc documents.
https://bugs.webkit.org/show_bug.cgi?id=151744
Reviewed by Ryosuke Niwa.
Source/WebCore:
Make sure that PreloadRequest is resolving URLs based on the document's
baseURL() rather than using url() as the base URL, which is not how URLs
are resolved by the parser, and fails when document->url() diverges from
the document's base URL (e.g. in the case of srcdoc based documents).
Test: fast/preloader/iframe-srcdoc.html
* html/parser/HTMLResourcePreloader.cpp:
(WebCore::PreloadRequest::completeURL):
LayoutTests:
Added a test that makes sure that srcdoc based subresources are properly preloaded.
* fast/preloader/iframe-srcdoc-expected.txt: Added.
* fast/preloader/iframe-srcdoc.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorehtmlparserHTMLResourcePreloadercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastpreloaderiframesrcdocexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastpreloaderiframesrcdochtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195094 => 195095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 08:22:38 UTC (rev 195094)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2016-01-15 08:26:42 UTC (rev 195095)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-12-02 Yoav Weiss <yoav@yoav.ws>
+
+ Fix preloader issue with srcdoc documents.
+ https://bugs.webkit.org/show_bug.cgi?id=151744
+
+ Reviewed by Ryosuke Niwa.
+
+ Added a test that makes sure that srcdoc based subresources are properly preloaded.
+
+ * fast/preloader/iframe-srcdoc-expected.txt: Added.
+ * fast/preloader/iframe-srcdoc.html: Added.
+
</ins><span class="cx"> 2015-12-02 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastpreloaderiframesrcdocexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt (0 => 195095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc-expected.txt 2016-01-15 08:26:42 UTC (rev 195095)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+CONSOLE MESSAGE: line 1: PASS
+This test has to be run as a layout test in order to see if resources were loaded and the test passed.
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+ <script src=resources/script1.js></script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastpreloaderiframesrcdochtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html (0 => 195095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/preloader/iframe-srcdoc.html 2016-01-15 08:26:42 UTC (rev 195095)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<body>
+<script>
+ if (window.testRunner) {
+ testRunner.dumpChildFramesAsText();
+ testRunner.dumpAsText();
+ }
+
+</script>
+This test has to be run as a layout test in order to see if resources were loaded and the test passed.
+<iframe srcdoc="<script> window.addEventListener('DOMContentLoaded', function() { if (window.internals) console.log(internals.isPreloaded('resources/script1.js') ? 'PASS' : 'FAIL'); }, false); </script><script src=resources/non-existant.js></script><script>document.write('<plaintext>');</script> <script src=resources/script1.js></script>" />
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195094 => 195095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 08:22:38 UTC (rev 195094)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2016-01-15 08:26:42 UTC (rev 195095)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-12-02 Yoav Weiss <yoav@yoav.ws>
+
+ Fix preloader issue with srcdoc documents.
+ https://bugs.webkit.org/show_bug.cgi?id=151744
+
+ Reviewed by Ryosuke Niwa.
+
+ Make sure that PreloadRequest is resolving URLs based on the document's
+ baseURL() rather than using url() as the base URL, which is not how URLs
+ are resolved by the parser, and fails when document->url() diverges from
+ the document's base URL (e.g. in the case of srcdoc based documents).
+
+ Test: fast/preloader/iframe-srcdoc.html
+
+ * html/parser/HTMLResourcePreloader.cpp:
+ (WebCore::PreloadRequest::completeURL):
+
</ins><span class="cx"> 2015-12-02 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Null dereference loading Blink layout test fast/loader/unload-mutation-crash.html
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorehtmlparserHTMLResourcePreloadercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp (195094 => 195095)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-01-15 08:22:38 UTC (rev 195094)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/html/parser/HTMLResourcePreloader.cpp 2016-01-15 08:26:42 UTC (rev 195095)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> URL PreloadRequest::completeURL(Document& document)
</span><span class="cx"> {
</span><del>- return document.completeURL(m_resourceURL, m_baseURL.isEmpty() ? document.url() : m_baseURL);
</del><ins>+ return document.completeURL(m_resourceURL, m_baseURL.isEmpty() ? document.baseURL() : m_baseURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest PreloadRequest::resourceRequest(Document& document)
</span></span></pre>
</div>
</div>
</body>
</html>