<!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>[190605] 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/190605">190605</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-10-05 22:43:03 -0700 (Mon, 05 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>data: URLs should not be preloaded
https://bugs.webkit.org/show_bug.cgi?id=149829
Reviewed by Ryosuke Niwa.
Source/WebCore:
Update the HTMLPreloadScanner so that data: URLs do not get preloaded.
There is no need as the data is already available.
Test: fast/preloader/image-data-url.html
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
LayoutTests:
Add layout test to make sure that images with a data: URL do not
get preloaded.
* fast/preloader/image-data-url-expected.txt: Added.
* fast/preloader/image-data-url.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="#trunkSourceWebCorehtmlparserHTMLPreloadScannercpp">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastpreloaderimagedataurlexpectedtxt">trunk/LayoutTests/fast/preloader/image-data-url-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastpreloaderimagedataurlhtml">trunk/LayoutTests/fast/preloader/image-data-url.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190604 => 190605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-06 04:13:32 UTC (rev 190604)
+++ trunk/LayoutTests/ChangeLog 2015-10-06 05:43:03 UTC (rev 190605)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-05 Chris Dumez <cdumez@apple.com>
+
+ data: URLs should not be preloaded
+ https://bugs.webkit.org/show_bug.cgi?id=149829
+
+ Reviewed by Ryosuke Niwa.
+
+ Add layout test to make sure that images with a data: URL do not
+ get preloaded.
+
+ * fast/preloader/image-data-url-expected.txt: Added.
+ * fast/preloader/image-data-url.html: Added.
+
</ins><span class="cx"> 2015-10-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] REGRESSION(r190434): Media continues to play when locking screen
</span></span></pre></div>
<a id="trunkLayoutTestsfastpreloaderimagedataurlexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/preloader/image-data-url-expected.txt (0 => 190605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/preloader/image-data-url-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/preloader/image-data-url-expected.txt 2015-10-06 05:43:03 UTC (rev 190605)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+PASS internals.isPreloaded("data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7"); is false
+Tests that data URLs are not preloaded.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastpreloaderimagedataurlhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/preloader/image-data-url.html (0 => 190605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/preloader/image-data-url.html (rev 0)
+++ trunk/LayoutTests/fast/preloader/image-data-url.html 2015-10-06 05:43:03 UTC (rev 190605)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
+<script>
+ shouldBeFalse('internals.isPreloaded("data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7");');
+</script>
+</head>
+<body>
+<p>Tests that data URLs are not preloaded.</p>
+<img src="data:image/gif;base64,R0lGODlhEAAOALMAAOazToeHh0tLS/7LZv/0jvb29t/f3//Ub//ge8WSLf/rhf/3kdbW1mxsbP//mf///yH5BAAAAAAALAAAAAAQAA4AAARe8L1Ekyky67QZ1hLnjM5UUde0ECwLJoExKcppV0aCcGCmTIHEIUEqjgaORCMxIC6e0CcguWw6aFjsVMkkIr7g77ZKPJjPZqIyd7sJAgVGoEGv2xsBxqNgYPj/gAwXEQA7">
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190604 => 190605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-06 04:13:32 UTC (rev 190604)
+++ trunk/Source/WebCore/ChangeLog 2015-10-06 05:43:03 UTC (rev 190605)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-05 Chris Dumez <cdumez@apple.com>
+
+ data: URLs should not be preloaded
+ https://bugs.webkit.org/show_bug.cgi?id=149829
+
+ Reviewed by Ryosuke Niwa.
+
+ Update the HTMLPreloadScanner so that data: URLs do not get preloaded.
+ There is no need as the data is already available.
+
+ Test: fast/preloader/image-data-url.html
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::StartTagScanner::shouldPreload):
+
</ins><span class="cx"> 2015-10-05 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] REGRESSION(r190434): Media continues to play when locking screen
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (190604 => 190605)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-10-06 04:13:32 UTC (rev 190604)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2015-10-06 05:43:03 UTC (rev 190605)
</span><span class="lines">@@ -218,6 +218,9 @@
</span><span class="cx"> if (m_urlToLoad.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (m_urlToLoad.startsWith("data:", false))
+ return false;
+
</ins><span class="cx"> if (m_tagId == TagId::Link && !m_linkIsStyleSheet)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>