<!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>[194928] trunk/LayoutTests</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/194928">194928</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-01-12 14:29:43 -0800 (Tue, 12 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid downloading the wrong image for <picture> elements.
https://bugs.webkit.org/show_bug.cgi?id=153027
Reviewed by Dean Jackson.
* fast/picture/image-picture-loads-1x-expected.txt: Added.
* fast/picture/image-picture-loads-1x.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastpictureimagepictureloads1xexpectedtxt">trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastpictureimagepictureloads1xhtml">trunk/LayoutTests/fast/picture/image-picture-loads-1x.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194927 => 194928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-12 22:28:59 UTC (rev 194927)
+++ trunk/LayoutTests/ChangeLog 2016-01-12 22:29:43 UTC (rev 194928)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-12 Dave Hyatt <hyatt@apple.com>
+
+ Avoid downloading the wrong image for <picture> elements.
+ https://bugs.webkit.org/show_bug.cgi?id=153027
+
+ Reviewed by Dean Jackson.
+
+ * fast/picture/image-picture-loads-1x-expected.txt: Added.
+ * fast/picture/image-picture-loads-1x.html: Added.
+
</ins><span class="cx"> 2016-01-12 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> XSS Auditor should navigate to empty substitute data on full page block
</span></span></pre></div>
<a id="trunkLayoutTestsfastpictureimagepictureloads1xexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt (0 => 194928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/picture/image-picture-loads-1x-expected.txt 2016-01-12 22:29:43 UTC (rev 194928)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+image-set-2x.png - willSendRequest <NSURLRequest URL image-set-2x.png, main document URL image-picture-loads-1x.html, http method GET> redirectResponse (null)
+resources/image-set-4x.png - willSendRequest <NSURLRequest URL resources/image-set-4x.png, main document URL image-picture-loads-1x.html, http method GET> redirectResponse (null)
+data:,b - willSendRequest <NSURLRequest URL data:,b, main document URL image-picture-loads-1x.html, http method GET> redirectResponse (null)
+image-picture-loads-1x.html - didFinishLoading
+image-set-2x.png - didReceiveResponse <NSURLResponse image-set-2x.png, http status code 0>
+image-set-2x.png - didFinishLoading
+resources/image-set-4x.png - didReceiveResponse <NSURLResponse resources/image-set-4x.png, http status code 0>
+resources/image-set-4x.png - didFinishLoading
+data:,b - didReceiveResponse <NSURLResponse data:,b, http status code 0>
+data:,b - didFinishLoading
+
+some text
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastpictureimagepictureloads1xhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/picture/image-picture-loads-1x.html (0 => 194928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/picture/image-picture-loads-1x.html (rev 0)
+++ trunk/LayoutTests/fast/picture/image-picture-loads-1x.html 2016-01-12 22:29:43 UTC (rev 194928)
</span><span class="lines">@@ -0,0 +1,108 @@
</span><ins>+<!DOCTYPE html>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.dumpResourceLoadCallbacks();
+ }
+ </script>
+ <!-- simple picture construct -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="simple" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- Multiple img elements -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img src="resources/blue_rect.jpg?1">
+ <img id="multiple" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- non-source children - should be ignored-->
+ <picture>
+ <div>some text</div>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="other_children" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- source with unknown type - should be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" type="image/nonsense" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="unknown_type" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- SVG source - should not be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" type="image/svg+xml" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="svg_type" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- Empty type - should not be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" type="" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="empty_type" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- whitespace type - should not be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" type=" " sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="whitespace_type" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- parameter type - should not be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" type="image/png;bla=bla" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
+ resources/image-set-4x.png?10002 1600w">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="parameter_type" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- source with empty srcset - should be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" sizes="800px" srcset=", , ">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="empty_srcset" src="resources/blue_rect.jpg?1">
+ </picture>
+ <!-- source with no srcset - should be ignored -->
+ <picture>
+ <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
+ resources/image-set-4x.png?10001 1600w">
+ <source media="(max-width: 800px)" sizes="800px">
+ <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
+ resources/image-set-4x.png?10003 1600w">
+ <img id="no_srcset" src="resources/blue_rect.jpg?1">
+ </picture>
+ <picture><source srcset="data:,b"><img src="resources/blue_rect.jpg?1"></picture>
</ins></span></pre>
</div>
</div>
</body>
</html>