<!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>[194865] 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/194865">194865</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2016-01-11 13:49:20 -0800 (Mon, 11 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Picture element needs to work with the preload scanner and select the correct
source element instead of loading the image.
https://bugs.webkit.org/show_bug.cgi?id=152983
Reviewed by Dean Jackson.
Source/WebCore:
Added new tests in http/tests/loading.
* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::tagIdFor):
(WebCore::TokenPreloadScanner::initiatorFor):
(WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner):
(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
(WebCore::TokenPreloadScanner::StartTagScanner::processImageAndScriptAttribute):
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
(WebCore::TokenPreloadScanner::StartTagScanner::resourceType):
(WebCore::TokenPreloadScanner::scan):
* html/parser/HTMLPreloadScanner.h:
(WebCore::TokenPreloadScanner::setPredictedBaseElementURL):
(WebCore::TokenPreloadScanner::inPicture):
LayoutTests:
These tests are imported from Blink, although they have been modified slightly to
reflect the fact that we pass the nested <picture> cases that Blink fails.
* http/tests/loading/hidpi-preload-picture-sizes-expected.txt: Added.
* http/tests/loading/hidpi-preload-picture-sizes.html: Added.
* http/tests/loading/preload-picture-invalid-expected.txt: Added.
* http/tests/loading/preload-picture-invalid.html: Added.
* http/tests/loading/preload-picture-nested-expected.txt: Added.
* http/tests/loading/preload-picture-nested.html: Added.
* http/tests/loading/preload-picture-sizes-expected.txt: Added.
* http/tests/loading/preload-picture-sizes.html: Added.
* http/tests/loading/resources/base-image1.png: Added.
* http/tests/loading/resources/base-image2.png: Added.
* http/tests/loading/resources/base-image3.png: Added.
* http/tests/loading/resources/dup-image1.png: Added.
* http/tests/loading/resources/dup-image2.png: Added.
* http/tests/loading/resources/dup-image3.png: Added.
* http/tests/loading/resources/image1.png: Added.
* http/tests/loading/resources/image2.png: Added.
* http/tests/loading/resources/picture-preload-helper.js: 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>
<li><a href="#trunkSourceWebCorehtmlparserHTMLPreloadScannerh">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestshttptestsloadinghidpipreloadpicturesizesexpectedtxt">trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsloadinghidpipreloadpicturesizeshtml">trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes.html</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadpictureinvalidexpectedtxt">trunk/LayoutTests/http/tests/loading/preload-picture-invalid-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadpictureinvalidhtml">trunk/LayoutTests/http/tests/loading/preload-picture-invalid.html</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadpicturenestedexpectedtxt">trunk/LayoutTests/http/tests/loading/preload-picture-nested-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadpicturenestedhtml">trunk/LayoutTests/http/tests/loading/preload-picture-nested.html</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadpicturesizesexpectedtxt">trunk/LayoutTests/http/tests/loading/preload-picture-sizes-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingpreloadpicturesizeshtml">trunk/LayoutTests/http/tests/loading/preload-picture-sizes.html</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesbaseimage1png">trunk/LayoutTests/http/tests/loading/resources/base-image1.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesbaseimage2png">trunk/LayoutTests/http/tests/loading/resources/base-image2.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesbaseimage3png">trunk/LayoutTests/http/tests/loading/resources/base-image3.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesdupimage1png">trunk/LayoutTests/http/tests/loading/resources/dup-image1.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesdupimage2png">trunk/LayoutTests/http/tests/loading/resources/dup-image2.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesdupimage3png">trunk/LayoutTests/http/tests/loading/resources/dup-image3.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesimage1png">trunk/LayoutTests/http/tests/loading/resources/image1.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcesimage2png">trunk/LayoutTests/http/tests/loading/resources/image2.png</a></li>
<li><a href="#trunkLayoutTestshttptestsloadingresourcespicturepreloadhelperjs">trunk/LayoutTests/http/tests/loading/resources/picture-preload-helper.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194864 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-11 21:37:35 UTC (rev 194864)
+++ trunk/LayoutTests/ChangeLog 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2016-01-11 Dave Hyatt <hyatt@apple.com>
+
+ Picture element needs to work with the preload scanner and select the correct
+ source element instead of loading the image.
+ https://bugs.webkit.org/show_bug.cgi?id=152983
+
+ Reviewed by Dean Jackson.
+
+ These tests are imported from Blink, although they have been modified slightly to
+ reflect the fact that we pass the nested <picture> cases that Blink fails.
+
+ * http/tests/loading/hidpi-preload-picture-sizes-expected.txt: Added.
+ * http/tests/loading/hidpi-preload-picture-sizes.html: Added.
+ * http/tests/loading/preload-picture-invalid-expected.txt: Added.
+ * http/tests/loading/preload-picture-invalid.html: Added.
+ * http/tests/loading/preload-picture-nested-expected.txt: Added.
+ * http/tests/loading/preload-picture-nested.html: Added.
+ * http/tests/loading/preload-picture-sizes-expected.txt: Added.
+ * http/tests/loading/preload-picture-sizes.html: Added.
+ * http/tests/loading/resources/base-image1.png: Added.
+ * http/tests/loading/resources/base-image2.png: Added.
+ * http/tests/loading/resources/base-image3.png: Added.
+ * http/tests/loading/resources/dup-image1.png: Added.
+ * http/tests/loading/resources/dup-image2.png: Added.
+ * http/tests/loading/resources/dup-image3.png: Added.
+ * http/tests/loading/resources/image1.png: Added.
+ * http/tests/loading/resources/image2.png: Added.
+ * http/tests/loading/resources/picture-preload-helper.js: Added.
+
</ins><span class="cx"> 2016-01-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: storage/indexeddb/key-generator.html fails.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsloadinghidpipreloadpicturesizesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes-expected.txt (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes-expected.txt 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,54 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+PASS internals.isPreloaded('resources/image2.png'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?1'); is false
+PASS internals.isPreloaded('resources/base-image1.png?1'); is false
+PASS internals.isPreloaded('resources/base-image2.png?1'); is true
+PASS internals.isPreloaded('resources/base-image3.png?1'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?2'); is false
+PASS internals.isPreloaded('resources/base-image1.png?2'); is false
+PASS internals.isPreloaded('resources/base-image2.png?2'); is true
+PASS internals.isPreloaded('resources/base-image3.png?2'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?3'); is false
+PASS internals.isPreloaded('resources/base-image1.png?3'); is false
+PASS internals.isPreloaded('resources/base-image2.png?3'); is true
+PASS internals.isPreloaded('resources/base-image3.png?3'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?4'); is false
+PASS internals.isPreloaded('resources/base-image1.png?4'); is false
+PASS internals.isPreloaded('resources/base-image2.png?4'); is true
+PASS internals.isPreloaded('resources/base-image3.png?4'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?5'); is false
+PASS internals.isPreloaded('resources/base-image1.png?5'); is false
+PASS internals.isPreloaded('resources/base-image2.png?5'); is true
+PASS internals.isPreloaded('resources/base-image3.png?5'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?6'); is false
+PASS internals.isPreloaded('resources/base-image1.png?6'); is false
+PASS internals.isPreloaded('resources/base-image2.png?6'); is true
+PASS internals.isPreloaded('resources/base-image3.png?6'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?7'); is false
+PASS internals.isPreloaded('resources/base-image1.png?7'); is false
+PASS internals.isPreloaded('resources/base-image2.png?7'); is true
+PASS internals.isPreloaded('resources/base-image3.png?7'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?8'); is false
+PASS internals.isPreloaded('resources/base-image1.png?8'); is false
+PASS internals.isPreloaded('resources/base-image2.png?8'); is true
+PASS internals.isPreloaded('resources/base-image3.png?8'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?9'); is false
+PASS internals.isPreloaded('resources/base-image1.png?9'); is false
+PASS internals.isPreloaded('resources/base-image2.png?9'); is true
+PASS internals.isPreloaded('resources/base-image3.png?9'); is false
+PASS internals.isPreloaded('resources/dup-image1.png?7'); is false
+PASS internals.isPreloaded('resources/dup-image1.png?8'); is false
+PASS internals.isPreloaded('resources/dup-image2.png?8'); is false
+PASS internals.isPreloaded('resources/dup-image3.png?8'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?10'); is false
+PASS internals.isPreloaded('resources/base-image1.png?10'); is true
+PASS internals.isPreloaded('resources/base-image2.png?10'); is false
+PASS internals.isPreloaded('resources/base-image3.png?10'); is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadinghidpipreloadpicturesizeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes.html (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes.html (rev 0)
+++ trunk/LayoutTests/http/tests/loading/hidpi-preload-picture-sizes.html 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+<html>
+<head>
+<script src="/js-test-resources/js-test.js"></script>
+<script src="../resources/srcset-helper.js"></script>
+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
+<script src="resources/picture-preload-helper.js"></script>
+</head>
+<body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ shouldBeTrue("internals.isPreloaded('resources/image2.png');");
+ for (var i = 1; i <= 9; ++i) {
+ loadFromSource2x(i);
+ }
+ shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?7');");
+ shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?8');");
+ shouldBeFalse("internals.isPreloaded('resources/dup-image2.png?8');");
+ shouldBeFalse("internals.isPreloaded('resources/dup-image3.png?8');");
+ shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?10');");
+ shouldBeTrue("internals.isPreloaded('resources/base-image1.png?10');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image2.png?10');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image3.png?10');");
+</script>
+<!-- Control group -->
+<picture>
+ <source srcset="resources/image2.png">
+ <img src="preload-test.jpg?1">
+</picture>
+<!-- All permutations of src, srcset and sizes -->
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?1 200w, resources/base-image3.png?1 400w, resources/base-image2.png?1 800w">
+ <img src="preload-test.jpg?1">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?2 200w, resources/base-image3.png?2 400w, resources/base-image2.png?2 800w" sizes="400px">
+ <img src="preload-test.jpg?2">
+</picture>
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?3 200w, resources/base-image3.png?3 400w, resources/base-image2.png?3 800w">
+ <img src="preload-test.jpg?3">
+</picture>
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-image3.png?4 400w, resources/base-image2.png?4 800w">
+ <img src="preload-test.jpg?4">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w" sizes="400px">
+ <img src="preload-test.jpg?5">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?6 200w, resources/base-image3.png?6 400w, resources/base-image2.png?6 800w" sizes="400px">
+ <img src="preload-test.jpg?6">
+</picture>
+<!-- Duplicate attributes -->
+<picture>
+ <source srcset="resources/base-image1.png?7 200w, resources/base-image3.png?7 400w, resources/base-image2.png?7 800w" sizes="400px"
+ src="resources/dup-image1.png?7">
+ <img src="preload-test.jpg?7">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?8 200w, resources/base-image3.png?8 400w, resources/base-image2.png?8 800w" sizes="400px"
+ srcset="resources/dup-image1.png?8 200w, resources/dup-image3.png?8 400w, resources/dup-image2.png?8 800w">
+ <img src="preload-test.jpg?8">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?9 200w, resources/base-image3.png?9 400w, resources/base-image2.png?9 800w" sizes="400px"
+ sizes="800px">
+ <img src="preload-test.jpg?9">
+</picture>
+<!-- Sizes with 'x' descriptors -->
+<picture>
+ <source srcset="resources/preload-test.jpg?10, resources/base-image1.png?10 2x, resources/base-image3.png?10 4x, resources/base-image2.png?10 8x" sizes="400px">
+ <img src="preload-test.jpg?10">
+</picture>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadpictureinvalidexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/preload-picture-invalid-expected.txt (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-picture-invalid-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-picture-invalid-expected.txt 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+PASS internals.isPreloaded('resources/preload-test.jpg?0'); is true
+PASS internals.isPreloaded('resources/image2.png'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?2'); is true
+PASS internals.isPreloaded('resources/base-image1.png?2'); is false
+PASS internals.isPreloaded('resources/base-image2.png?2'); is false
+PASS internals.isPreloaded('resources/base-image3.png?2'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?3'); is false
+PASS internals.isPreloaded('resources/base-image1.png?3'); is false
+PASS internals.isPreloaded('resources/base-image2.png?3'); is false
+PASS internals.isPreloaded('resources/base-image3.png?3'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?4'); is false
+PASS internals.isPreloaded('resources/base-image1.png?4'); is false
+PASS internals.isPreloaded('resources/base-image2.png?4'); is false
+PASS internals.isPreloaded('resources/base-image3.png?4'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?5'); is false
+PASS internals.isPreloaded('resources/base-image1.png?5'); is false
+PASS internals.isPreloaded('resources/base-image2.png?5'); is false
+PASS internals.isPreloaded('resources/base-image3.png?5'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?6'); is true
+PASS internals.isPreloaded('resources/base-image1.png?6'); is false
+PASS internals.isPreloaded('resources/base-image2.png?6'); is false
+PASS internals.isPreloaded('resources/base-image3.png?6'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?7'); is true
+PASS internals.isPreloaded('resources/base-image1.png?7'); is false
+PASS internals.isPreloaded('resources/base-image2.png?7'); is false
+PASS internals.isPreloaded('resources/base-image3.png?7'); is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
+ bla
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadpictureinvalidhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/preload-picture-invalid.html (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-picture-invalid.html (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-picture-invalid.html 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,84 @@
</span><ins>+<html>
+<head>
+<script src="/js-test-resources/js-test.js"></script>
+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
+<script src="resources/picture-preload-helper.js"></script>
+</head>
+<body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?0');");
+ shouldBeTrue("internals.isPreloaded('resources/image2.png');");
+ loadFromImg(2);
+ loadFromSource(3);
+ loadFromSource(4);
+ loadFromSource(5);
+ loadFromImg(6);
+ loadFromImg(7);
+</script>
+<!-- Control group -->
+<img src="resources/preload-test.jpg?0">
+<picture>
+<source srcset="resources/image2.png">
+<img></picture>
+<!-- Invalid nesting tests -->
+<!-- In the following tests, nesting messes up the selection algorithm -->
+<picture>
+ <picture>
+ <source sizes="400px" srcset="resources/base-image1.png?1 200w, resources/base-image3.png?1 400w, resources/base-image2.png?1 800w">
+ <div>
+ </picture>
+ </div>
+ <img src="resources/preload-test.jpg?1">
+ </picture>
+</picture>
+<picture>
+ <div>
+ </picture>
+ </picture>
+ </picture>
+ </div>
+ <source sizes="400px" srcset="resources/base-image1.png?2 200w, resources/base-image3.png?2 400w, resources/base-image2.png?2 800w">
+ <img src="resources/preload-test.jpg?2">
+</picture>
+<!-- Here we preload the correct resource, since document.write is not modifying the DOM -->
+<picture>
+ <script>document.write("bla");</script>
+ <source sizes="400px" srcset="resources/base-image1.png?3 200w, resources/base-image3.png?3 400w, resources/base-image2.png?3 800w">
+ <img src="resources/preload-test.jpg?3">
+</picture>
+<!-- In the following tests, nesting messes up the selection algorithm, but we don't get it -->
+<picture>
+ <div>
+ <picture>
+ <div>
+ <source sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-image3.png?4 400w, resources/base-image2.png?4 800w">
+ </div>
+ <img src="resources/preload-test.jpg?4">
+ </picture>
+ </div>
+</picture>
+<picture>
+ <div>
+ <picture>
+ <div>
+ <source sizes="400px" srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w">
+ <img src="resources/preload-test.jpg?5">
+ </div>
+ </picture>
+ </div>
+</picture>
+<!-- We don't keep a checkpoint of the picture stack, so document.write inside picture
+ *that modifies the DOM* will result in a false prediction -->
+<!-- In the following tests, we preload the wrong resource, because document.write is modifying the DOM -->
+<script>document.write('<picture>');</script>
+ <source sizes="400px" srcset="resources/base-image1.png?6 200w, resources/base-image3.png?6 400w, resources/base-image2.png?6 800w">
+ <img src="resources/preload-test.jpg?6">
+</picture>
+<picture>
+ <script>document.write('<source sizes="400px" srcset="resources/base-image1.png?7 200w, resources/base-image3.png?7 400w, resources/base-image2.png?7 800w">');</script>
+ <img src="resources/preload-test.jpg?7">
+</picture>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadpicturenestedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/preload-picture-nested-expected.txt (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-picture-nested-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-picture-nested-expected.txt 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+PASS internals.isPreloaded('resources/preload-test.jpg?0'); is true
+PASS internals.isPreloaded('resources/image2.png'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?1'); is false
+PASS internals.isPreloaded('resources/base-image1.png?1'); is false
+PASS internals.isPreloaded('resources/base-image2.png?1'); is false
+PASS internals.isPreloaded('resources/base-image3.png?1'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?2'); is false
+PASS internals.isPreloaded('resources/base-image1.png?2'); is false
+PASS internals.isPreloaded('resources/base-image2.png?2'); is false
+PASS internals.isPreloaded('resources/base-image3.png?2'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?3'); is false
+PASS internals.isPreloaded('resources/base-image1.png?3'); is false
+PASS internals.isPreloaded('resources/base-image2.png?3'); is false
+PASS internals.isPreloaded('resources/base-image3.png?3'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?4'); is false
+PASS internals.isPreloaded('resources/base-image1.png?4'); is false
+PASS internals.isPreloaded('resources/base-image2.png?4'); is false
+PASS internals.isPreloaded('resources/base-image3.png?4'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?5'); is false
+PASS internals.isPreloaded('resources/base-image1.png?5'); is false
+PASS internals.isPreloaded('resources/base-image2.png?5'); is false
+PASS internals.isPreloaded('resources/base-image3.png?5'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?6'); is false
+PASS internals.isPreloaded('resources/base-image1.png?6'); is false
+PASS internals.isPreloaded('resources/base-image2.png?6'); is false
+PASS internals.isPreloaded('resources/base-image3.png?6'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?7'); is false
+PASS internals.isPreloaded('resources/base-image1.png?7'); is false
+PASS internals.isPreloaded('resources/base-image2.png?7'); is false
+PASS internals.isPreloaded('resources/base-image3.png?7'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?71'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?72'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?8'); is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
+
+
+
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadpicturenestedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/preload-picture-nested.html (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-picture-nested.html (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-picture-nested.html 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,77 @@
</span><ins>+<html>
+<head>
+<script src="/js-test-resources/js-test.js"></script>
+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
+<script src="resources/picture-preload-helper.js"></script>
+</head>
+<body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?0');");
+ shouldBeTrue("internals.isPreloaded('resources/image2.png');");
+ loadFromSource(1);
+ loadFromSource(2);
+ loadFromSource(3);
+ loadFromSource(4);
+ loadFromSource(5);
+ loadFromSource(6);
+ loadFromSource(7);
+ shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?71');");
+ shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?72');");
+ shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?8');");
+</script>
+<!-- Control group -->
+<img src="resources/preload-test.jpg?0">
+<picture>
+<source srcset="resources/image2.png">
+<img></picture>
+<!-- nested element tests - In these we're doing the right thing -->
+<picture>
+ <picture>
+ <source sizes="400px" srcset="resources/base-image1.png?1 200w, resources/base-image3.png?1 400w, resources/base-image2.png?1 800w">
+ <img src="resources/preload-test.jpg?1">
+ </picture>
+</picture>
+<picture>
+ <div>
+ <picture>
+ <source sizes="400px" srcset="resources/base-image1.png?2 200w, resources/base-image3.png?2 400w, resources/base-image2.png?2 800w">
+ <img src="resources/preload-test.jpg?2">
+ </picture>
+ </div>
+</picture>
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?3 200w, resources/base-image3.png?3 400w, resources/base-image2.png?3 800w">
+ <div>
+ <picture>
+ <source sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-image3.png?4 400w, resources/base-image2.png?4 800w">
+ <img src="resources/preload-test.jpg?4">
+ </picture>
+ </div>
+ <img src="resources/preload-test.jpg?3">
+</picture>
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w">
+ <div />
+ <picture>
+ <source sizes="400px" srcset="resources/base-image1.png?6 200w, resources/base-image3.png?6 400w, resources/base-image2.png?6 800w">
+ <!-- We're getting this one right -->
+ <img src="resources/preload-test.jpg?6">
+ </picture>
+ </div>
+ <img src="resources/preload-test.jpg?5">
+</picture>
+<picture>
+ <picture>
+ <source sizes="400px" srcset="resources/base-image1.png?7 200w, resources/base-image3.png?7 400w, resources/base-image2.png?7 800w">
+ <img src="resources/preload-test.jpg?7">
+ <img src="resources/preload-test.jpg?71">
+ </picture>
+ <img src="resources/preload-test.jpg?72">
+</picture>
+<picture>
+ <img src="resources/preload-test.jpg?8">
+</picture>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadpicturesizesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/preload-picture-sizes-expected.txt (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-picture-sizes-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-picture-sizes-expected.txt 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+main frame - didHandleOnloadEventsForFrame
+main frame - didFinishLoadForFrame
+PASS internals.isPreloaded('resources/image2.png'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?1'); is false
+PASS internals.isPreloaded('resources/base-image1.png?1'); is false
+PASS internals.isPreloaded('resources/base-image2.png?1'); is false
+PASS internals.isPreloaded('resources/base-image3.png?1'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?2'); is false
+PASS internals.isPreloaded('resources/base-image1.png?2'); is false
+PASS internals.isPreloaded('resources/base-image2.png?2'); is false
+PASS internals.isPreloaded('resources/base-image3.png?2'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?3'); is false
+PASS internals.isPreloaded('resources/base-image1.png?3'); is false
+PASS internals.isPreloaded('resources/base-image2.png?3'); is false
+PASS internals.isPreloaded('resources/base-image3.png?3'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?4'); is false
+PASS internals.isPreloaded('resources/base-image1.png?4'); is false
+PASS internals.isPreloaded('resources/base-image2.png?4'); is false
+PASS internals.isPreloaded('resources/base-image3.png?4'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?5'); is false
+PASS internals.isPreloaded('resources/base-image1.png?5'); is false
+PASS internals.isPreloaded('resources/base-image2.png?5'); is false
+PASS internals.isPreloaded('resources/base-image3.png?5'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?6'); is false
+PASS internals.isPreloaded('resources/base-image1.png?6'); is false
+PASS internals.isPreloaded('resources/base-image2.png?6'); is false
+PASS internals.isPreloaded('resources/base-image3.png?6'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?7'); is false
+PASS internals.isPreloaded('resources/base-image1.png?7'); is false
+PASS internals.isPreloaded('resources/base-image2.png?7'); is false
+PASS internals.isPreloaded('resources/base-image3.png?7'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?8'); is false
+PASS internals.isPreloaded('resources/base-image1.png?8'); is false
+PASS internals.isPreloaded('resources/base-image2.png?8'); is false
+PASS internals.isPreloaded('resources/base-image3.png?8'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?9'); is false
+PASS internals.isPreloaded('resources/base-image1.png?9'); is false
+PASS internals.isPreloaded('resources/base-image2.png?9'); is false
+PASS internals.isPreloaded('resources/base-image3.png?9'); is true
+PASS internals.isPreloaded('resources/preload-test.jpg?10'); is false
+PASS internals.isPreloaded('resources/base-image1.png?10'); is false
+PASS internals.isPreloaded('resources/base-image2.png?10'); is false
+PASS internals.isPreloaded('resources/base-image3.png?10'); is true
+PASS internals.isPreloaded('resources/dup-image1.png?7'); is false
+PASS internals.isPreloaded('resources/dup-image1.png?8'); is false
+PASS internals.isPreloaded('resources/dup-image2.png?8'); is false
+PASS internals.isPreloaded('resources/dup-image3.png?8'); is false
+PASS internals.isPreloaded('resources/base-image1.png?101'); is false
+PASS internals.isPreloaded('resources/base-image2.png?101'); is false
+PASS internals.isPreloaded('resources/base-image3.png?101'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?10'); is false
+PASS internals.isPreloaded('resources/preload-test.jpg?11'); is true
+PASS internals.isPreloaded('resources/base-image1.png?11'); is false
+PASS internals.isPreloaded('resources/base-image2.png?11'); is false
+PASS internals.isPreloaded('resources/base-image3.png?11'); is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingpreloadpicturesizeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/preload-picture-sizes.html (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/preload-picture-sizes.html (rev 0)
+++ trunk/LayoutTests/http/tests/loading/preload-picture-sizes.html 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+<html>
+<head>
+<script src="/js-test-resources/js-test.js"></script>
+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
+<script src="resources/picture-preload-helper.js"></script>
+</head>
+<body>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ shouldBeTrue("internals.isPreloaded('resources/image2.png');");
+ for (var i = 1; i <= 10; ++i) {
+ loadFromSource(i);
+ }
+ shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?7');");
+ shouldBeFalse("internals.isPreloaded('resources/dup-image1.png?8');");
+ shouldBeFalse("internals.isPreloaded('resources/dup-image2.png?8');");
+ shouldBeFalse("internals.isPreloaded('resources/dup-image3.png?8');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image1.png?101');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image2.png?101');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image3.png?101');");
+ shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?10');");
+ loadFromImg(11);
+</script>
+<!-- Control group -->
+<picture>
+ <source srcset="resources/image2.png">
+ <img src="preload-test.jpg?1">
+</picture>
+<!-- All permutations of src, srcset and sizes -->
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?1 200w, resources/base-image3.png?1 400w, resources/base-image2.png?1 800w">
+ <img src="preload-test.jpg?1">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?2 200w, resources/base-image3.png?2 400w, resources/base-image2.png?2 800w" sizes="400px">
+ <img src="preload-test.jpg?2">
+</picture>
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?3 200w, resources/base-image3.png?3 400w, resources/base-image2.png?3 800w">
+ <img src="preload-test.jpg?3">
+</picture>
+<picture>
+ <source sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-image3.png?4 400w, resources/base-image2.png?4 800w">
+ <img src="preload-test.jpg?4">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w" sizes="400px">
+ <img src="preload-test.jpg?5">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?6 200w, resources/base-image3.png?6 400w, resources/base-image2.png?6 800w" sizes="400px">
+ <img src="preload-test.jpg?6">
+</picture>
+<!-- Duplicate attributes -->
+<picture>
+ <source srcset="resources/base-image1.png?7 200w, resources/base-image3.png?7 400w, resources/base-image2.png?7 800w" sizes="400px"
+ src="resources/dup-image1.png?7">
+ <img src="preload-test.jpg?7">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?8 200w, resources/base-image3.png?8 400w, resources/base-image2.png?8 800w" sizes="400px"
+ srcset="resources/dup-image1.png?8 200w, resources/dup-image3.png?8 400w, resources/dup-image2.png?8 800w">
+ <img src="preload-test.jpg?8">
+</picture>
+<picture>
+ <source srcset="resources/base-image1.png?9 200w, resources/base-image3.png?9 400w, resources/base-image2.png?9 800w" sizes="400px"
+ sizes="800px">
+ <img src="preload-test.jpg?9">
+</picture>
+<!-- Multiple sources -->
+<picture>
+ <source media="(max-width: 500px)" srcset="resources/base-image1.png?101 200w, resources/base-image3.png?101 400w,
+ resources/base-image2.png?101 10100w" sizes="400px">
+ <source media="(min-width: 501px)" srcset="resources/base-image1.png?10 200w, resources/base-image3.png?10 400w,
+ resources/base-image2.png?10 1000w" sizes="400px">
+ <img src="preload-test.jpg?10">
+</picture>
+<!-- Sizes with 'x' descriptors -->
+<picture>
+ <source srcset="resources/preload-test.jpg?11, resources/base-image1.png?11 2x, resources/base-image3.png?11 4x, resources/base-image2.png?11 8x" sizes="400px">
+ <img src="preload-test.jpg?11">
+</picture>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestsloadingresourcesbaseimage1png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/base-image1.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/base-image1.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesbaseimage2png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/base-image2.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/base-image2.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesbaseimage3png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/base-image3.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/base-image3.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesdupimage1png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/dup-image1.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/dup-image1.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesdupimage2png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/dup-image2.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/dup-image2.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesdupimage3png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/dup-image3.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/dup-image3.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesimage1png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/image1.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/image1.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcesimage2png"></a>
<div class="binary"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/image2.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: trunk/LayoutTests/http/tests/loading/resources/image2.png
</span><span class="cx">___________________________________________________________________
</span><a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="trunkLayoutTestshttptestsloadingresourcespicturepreloadhelperjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/loading/resources/picture-preload-helper.js (0 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/loading/resources/picture-preload-helper.js (rev 0)
+++ trunk/LayoutTests/http/tests/loading/resources/picture-preload-helper.js 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+function loadFromSource(i) {
+ shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image1.png?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image2.png?" + i + "');");
+ shouldBeTrue("internals.isPreloaded('resources/base-image3.png?" + i + "');");
+}
+function loadFromSource2x(i) {
+ shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image1.png?" + i + "');");
+ shouldBeTrue("internals.isPreloaded('resources/base-image2.png?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image3.png?" + i + "');");
+}
+function loadFromImg(i) {
+ shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image1.png?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image2.png?" + i + "');");
+ shouldBeFalse("internals.isPreloaded('resources/base-image3.png?" + i + "');");
+}
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194864 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-11 21:37:35 UTC (rev 194864)
+++ trunk/Source/WebCore/ChangeLog 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-01-11 Dave Hyatt <hyatt@apple.com>
+
+ Picture element needs to work with the preload scanner and select the correct
+ source element instead of loading the image.
+ https://bugs.webkit.org/show_bug.cgi?id=152983
+
+ Reviewed by Dean Jackson.
+
+ Added new tests in http/tests/loading.
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::tagIdFor):
+ (WebCore::TokenPreloadScanner::initiatorFor):
+ (WebCore::TokenPreloadScanner::StartTagScanner::StartTagScanner):
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes):
+ (WebCore::TokenPreloadScanner::StartTagScanner::processImageAndScriptAttribute):
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+ (WebCore::TokenPreloadScanner::StartTagScanner::resourceType):
+ (WebCore::TokenPreloadScanner::scan):
+ * html/parser/HTMLPreloadScanner.h:
+ (WebCore::TokenPreloadScanner::setPredictedBaseElementURL):
+ (WebCore::TokenPreloadScanner::inPicture):
+
</ins><span class="cx"> 2016-01-11 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: storage/indexeddb/key-generator.html fails.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (194864 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-01-11 21:37:35 UTC (rev 194864)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -34,6 +34,8 @@
</span><span class="cx"> #include "HTMLTokenizer.h"
</span><span class="cx"> #include "InputTypeNames.h"
</span><span class="cx"> #include "LinkRelAttribute.h"
</span><ins>+#include "MediaList.h"
+#include "MediaQueryEvaluator.h"
</ins><span class="cx"> #include "SourceSizeList.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><span class="lines">@@ -62,6 +64,10 @@
</span><span class="cx"> return TagId::Template;
</span><span class="cx"> if (tagName == metaTag)
</span><span class="cx"> return TagId::Meta;
</span><ins>+ if (tagName == pictureTag)
+ return TagId::Picture;
+ if (tagName == sourceTag)
+ return TagId::Source;
</ins><span class="cx"> return TagId::Unknown;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -70,6 +76,7 @@
</span><span class="cx"> switch (tagId) {
</span><span class="cx"> case TagId::Iframe:
</span><span class="cx"> return "iframe";
</span><ins>+ case TagId::Source:
</ins><span class="cx"> case TagId::Img:
</span><span class="cx"> return "img";
</span><span class="cx"> case TagId::Input:
</span><span class="lines">@@ -83,6 +90,7 @@
</span><span class="cx"> case TagId::Base:
</span><span class="cx"> case TagId::Template:
</span><span class="cx"> case TagId::Meta:
</span><ins>+ case TagId::Picture:
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return "unknown";
</span><span class="cx"> }
</span><span class="lines">@@ -101,22 +109,30 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void processAttributes(const HTMLToken::AttributeList& attributes, Document& document)
</del><ins>+ void processAttributes(const HTMLToken::AttributeList& attributes, Document& document, Vector<bool>& pictureState)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (m_tagId >= TagId::Unknown)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> for (auto& attribute : attributes) {
</span><span class="cx"> AtomicString attributeName(attribute.name);
</span><span class="cx"> String attributeValue = StringImpl::create8BitIfPossible(attribute.value);
</span><del>- processAttribute(attributeName, attributeValue);
</del><ins>+ processAttribute(attributeName, attributeValue, document, pictureState);
</ins><span class="cx"> }
</span><del>-
</del><ins>+
+ if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && !m_srcSetAttribute.isEmpty()) {
+ float sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
+ ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
+ if (!imageCandidate.isEmpty()) {
+ pictureState.last() = true;
+ setUrlToLoad(imageCandidate.string.toString(), true);
+ }
+ }
+
</ins><span class="cx"> // Resolve between src and srcSet if we have them and the tag is img.
</span><span class="cx"> if (m_tagId == TagId::Img && !m_srcSetAttribute.isEmpty()) {
</span><del>- float sourceSize = 0;
- sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
</del><ins>+ float sourceSize = parseSizesAttribute(m_sizesAttribute, document.renderView(), document.frame());
</ins><span class="cx"> ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
</span><span class="cx"> setUrlToLoad(imageCandidate.string.toString(), true);
</span><span class="cx"> }
</span><span class="lines">@@ -154,14 +170,19 @@
</span><span class="cx"> m_charset = attributeValue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- void processAttribute(const AtomicString& attributeName, const String& attributeValue)
</del><ins>+ void processAttribute(const AtomicString& attributeName, const String& attributeValue, Document& document, const Vector<bool>& pictureState)
</ins><span class="cx"> {
</span><ins>+ bool inPicture = !pictureState.isEmpty();
+ bool alreadyMatchedSource = inPicture && pictureState.last();
+
</ins><span class="cx"> switch (m_tagId) {
</span><span class="cx"> case TagId::Iframe:
</span><span class="cx"> if (match(attributeName, srcAttr))
</span><span class="cx"> setUrlToLoad(attributeValue);
</span><span class="cx"> break;
</span><span class="cx"> case TagId::Img:
</span><ins>+ if (inPicture && alreadyMatchedSource)
+ break;
</ins><span class="cx"> if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull()) {
</span><span class="cx"> m_srcSetAttribute = attributeValue;
</span><span class="cx"> break;
</span><span class="lines">@@ -172,6 +193,25 @@
</span><span class="cx"> }
</span><span class="cx"> processImageAndScriptAttribute(attributeName, attributeValue);
</span><span class="cx"> break;
</span><ins>+ case TagId::Source:
+ if (inPicture && alreadyMatchedSource)
+ break;
+ if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull()) {
+ m_srcSetAttribute = attributeValue;
+ break;
+ }
+ if (match(attributeName, sizesAttr) && m_sizesAttribute.isNull()) {
+ m_sizesAttribute = attributeValue;
+ break;
+ }
+ if (match(attributeName, mediaAttr) && m_mediaAttribute.isNull()) {
+ m_mediaAttribute = attributeValue;
+ Ref<MediaQuerySet> mediaSet = MediaQuerySet::createAllowingDescriptionSyntax(attributeValue);
+ Vector<std::unique_ptr<MediaQueryResult>> viewportDependentMediaQueryResults;
+ MediaQueryEvaluator evaluator(document.printing() ? "print" : "screen", document.frame(), document.documentElement()->computedStyle());
+ m_mediaMatched = evaluator.evalCheckingViewportDependentResults(mediaSet.ptr(), viewportDependentMediaQueryResults);
+ }
+ break;
</ins><span class="cx"> case TagId::Script:
</span><span class="cx"> processImageAndScriptAttribute(attributeName, attributeValue);
</span><span class="cx"> break;
</span><span class="lines">@@ -200,6 +240,7 @@
</span><span class="cx"> case TagId::Base:
</span><span class="cx"> case TagId::Style:
</span><span class="cx"> case TagId::Template:
</span><ins>+ case TagId::Picture:
</ins><span class="cx"> case TagId::Unknown:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -237,6 +278,7 @@
</span><span class="cx"> return CachedResource::Script;
</span><span class="cx"> case TagId::Img:
</span><span class="cx"> case TagId::Input:
</span><ins>+ case TagId::Source:
</ins><span class="cx"> ASSERT(m_tagId != TagId::Input || m_inputIsImage);
</span><span class="cx"> return CachedResource::ImageResource;
</span><span class="cx"> case TagId::Link:
</span><span class="lines">@@ -247,6 +289,7 @@
</span><span class="cx"> case TagId::Style:
</span><span class="cx"> case TagId::Base:
</span><span class="cx"> case TagId::Template:
</span><ins>+ case TagId::Picture:
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="lines">@@ -279,6 +322,7 @@
</span><span class="cx"> String m_urlToLoad;
</span><span class="cx"> String m_srcSetAttribute;
</span><span class="cx"> String m_sizesAttribute;
</span><ins>+ bool m_mediaMatched { true };
</ins><span class="cx"> String m_charset;
</span><span class="cx"> String m_crossOriginMode;
</span><span class="cx"> bool m_linkIsStyleSheet;
</span><span class="lines">@@ -317,7 +361,9 @@
</span><span class="cx"> if (m_inStyle)
</span><span class="cx"> m_cssScanner.reset();
</span><span class="cx"> m_inStyle = false;
</span><del>- }
</del><ins>+ } else if (tagId == TagId::Picture && !m_pictureSourceState.isEmpty())
+ m_pictureSourceState.removeLast();
+
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -344,9 +390,13 @@
</span><span class="cx"> updatePredictedBaseURL(token);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+ if (tagId == TagId::Picture) {
+ m_pictureSourceState.append(false);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> StartTagScanner scanner(tagId, m_deviceScaleFactor);
</span><del>- scanner.processAttributes(token.attributes(), document);
</del><ins>+ scanner.processAttributes(token.attributes(), document, m_pictureSourceState);
</ins><span class="cx"> if (auto request = scanner.createPreloadRequest(m_predictedBaseElementURL))
</span><span class="cx"> requests.append(WTFMove(request));
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h (194864 => 194865)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h 2016-01-11 21:37:35 UTC (rev 194864)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.h 2016-01-11 21:49:20 UTC (rev 194865)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx"> void scan(const HTMLToken&, PreloadRequestStream&, Document&);
</span><span class="cx">
</span><span class="cx"> void setPredictedBaseElementURL(const URL& url) { m_predictedBaseElementURL = url; }
</span><ins>+
+ bool inPicture() { return !m_pictureSourceState.isEmpty(); }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> enum class TagId {
</span><span class="lines">@@ -51,12 +53,14 @@
</span><span class="cx"> Link,
</span><span class="cx"> Script,
</span><span class="cx"> Meta,
</span><ins>+ Source,
</ins><span class="cx">
</span><span class="cx"> // These tags are not scanned by the StartTagScanner.
</span><span class="cx"> Unknown,
</span><span class="cx"> Style,
</span><span class="cx"> Base,
</span><span class="cx"> Template,
</span><ins>+ Picture
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class StartTagScanner;
</span><span class="lines">@@ -73,6 +77,9 @@
</span><span class="cx">
</span><span class="cx"> URL m_predictedBaseElementURL;
</span><span class="cx"> bool m_inStyle { false };
</span><ins>+
+ Vector<bool> m_pictureSourceState;
+
</ins><span class="cx"> #if ENABLE(TEMPLATE_ELEMENT)
</span><span class="cx"> unsigned m_templateCount { 0 };
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>