<!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>[224928] 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/224928">224928</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-11-16 11:13:42 -0800 (Thu, 16 Nov 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Source/WebCore:
Added mime type check to the picture source preloader to avoid downloading incompatible resources.
https://bugs.webkit.org/show_bug.cgi?id=179231

Patch by Colin Bendell <colin@bendell.ca> on 2017-11-16
Reviewed by Alex Christensen.

Test: http/tests/loading/preload-picture-type.html

* html/parser/HTMLPreloadScanner.cpp:
(WebCore::TokenPreloadScanner::StartTagScanner::processAttributes): include type match state when selecting candidate imgs
(WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): added type attribute evaluation and matching

LayoutTests:
Add tests to ensure that <source> tags are only preloaded when the `type`
attribute matches.
https://bugs.webkit.org/show_bug.cgi?id=179231

Patch by Colin Bendell <colin@bendell.ca> on 2017-11-16
Reviewed by Alex Christensen.

* http/tests/preload/picture-type-expected.txt: Added.
* http/tests/preload/picture-type.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="#trunkLayoutTestshttptestspreloadpicturetypeexpectedtxt">trunk/LayoutTests/http/tests/preload/picture-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestspreloadpicturetypehtml">trunk/LayoutTests/http/tests/preload/picture-type.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (224927 => 224928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2017-11-16 19:08:37 UTC (rev 224927)
+++ trunk/LayoutTests/ChangeLog 2017-11-16 19:13:42 UTC (rev 224928)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2017-11-16  Colin Bendell  <colin@bendell.ca>
+
+        Add tests to ensure that <source> tags are only preloaded when the `type`
+        attribute matches.
+        https://bugs.webkit.org/show_bug.cgi?id=179231
+
+        Reviewed by Alex Christensen.
+
+        * http/tests/preload/picture-type-expected.txt: Added.
+        * http/tests/preload/picture-type.html: Added.
+
</ins><span class="cx"> 2017-11-16  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Dispatching an event on a ServiceWorker may fail or crash due to GC
</span></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadpicturetypeexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/picture-type-expected.txt (0 => 224928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/picture-type-expected.txt                           (rev 0)
+++ trunk/LayoutTests/http/tests/preload/picture-type-expected.txt      2017-11-16 19:13:42 UTC (rev 224928)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+PASS internals.isPreloaded('/resources/square20.jpg?0&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?0'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?1&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?1'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?2&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?2'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?3&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?3'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?4&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?4&100w'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?4&1000w'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?4'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?5&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?5&100w'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?5&800w'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?5&1000w'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?6&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?6'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?7&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?7'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?8&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?8'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?9&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?9'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?10&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?10&dup'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?10'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?11&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?11&bad'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?11'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?12&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?12&bad'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?12'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?13&preload'); is true
+PASS internals.isPreloaded('/resources/square20.jpg?13&bad'); is false
+PASS internals.isPreloaded('/resources/square20.jpg?13&invalid'); is false
+PASS successfullyParsed is true
+
+TEST COMPLETE
+                           
</ins></span></pre></div>
<a id="trunkLayoutTestshttptestspreloadpicturetypehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/http/tests/preload/picture-type.html (0 => 224928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/preload/picture-type.html                           (rev 0)
+++ trunk/LayoutTests/http/tests/preload/picture-type.html      2017-11-16 19:13:42 UTC (rev 224928)
</span><span class="lines">@@ -0,0 +1,132 @@
</span><ins>+<html>
+<head>
+    <script>
+        if (window.testRunner && window.internals) {
+            testRunner.dumpAsText();
+            internals.clearMemoryCache();
+        }
+    </script>
+
+    <script src="/js-test-resources/js-test.js"></script>
+    <script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=101&test=picture-type"></script>
+</head>
+<body>
+<script>
+    if (window.testRunner && window.internals) {
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?0&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?0');");
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?1&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?1');");
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?2&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?2');");
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?3&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?3');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?4&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?4&100w');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?4&1000w');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?4');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?5&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?5&100w');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?5&800w');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?5&1000w');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?6&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?6');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?7&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?7');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?8&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?8');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?9&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?9');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?10&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?10&dup');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?10');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?11&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?11&bad');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?11');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?12&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?12&bad');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?12');");
+
+        shouldBeTrue("internals.isPreloaded('/resources/square20.jpg?13&preload');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?13&bad');");
+        shouldBeFalse("internals.isPreloaded('/resources/square20.jpg?13&invalid');");
+    }
+</script>
+<!-- Control group -->
+<picture>
+    <source srcset="/resources/square20.jpg?0&preload">
+    <img src="/resources/square20.jpg?0">
+</picture>
+<!-- All permutations of type, media, srcset and sizes -->
+
+<picture>
+    <source type="image/jpeg" srcset="/resources/square20.jpg?1&preload">
+    <img src="/resources/square20.jpg?1">
+</picture>
+<picture>
+    <source srcset="/resources/square20.jpg?2&preload" type="image/jpeg">
+    <img src="/resources/square20.jpg?2">
+</picture>
+<picture>
+    <source type="image/bad" srcset="/resources/square20.jpg?3">
+    <img src="/resources/square20.jpg?3&preload">
+</picture>
+<picture>
+    <source type="image/jpeg" sizes="200px" srcset="/resources/square20.jpg?4&100w 100w, /resources/square20.jpg?4&preload 800w, /resources/square20.jpg?4&1000w 1000w">
+    <img src="/resources/image1.jpg?4">
+</picture>
+<picture>
+    <source type="image/bad" sizes="200px" srcset="/resources/square20.jpg?5&100w 100w, /resources/image3.jpg?5&800w 800w, /resources/square20.jpg?5&1000w 1000w" >
+    <img src="/resources/square20.jpg?5&preload">
+</picture>
+<picture>
+    <source type="image/jpeg" media="(min-width: 1px)" srcset="/resources/square20.jpg?6&preload">
+    <img src="/resources/square20.jpg?6">
+</picture>
+<picture>
+    <source type="image/bad" media="(min-width: 1px)" srcset="/resources/square20.jpg?7">
+    <img src="/resources/square20.jpg?7&preload">
+</picture>
+
+<!-- Duplicate attributes -->
+<picture>
+    <source type="image/jpeg" type="image/bad" srcset="/resources/square20.jpg?8&preload">
+    <img src="/resources/square20.jpg?8">
+</picture>
+<picture>
+    <source type="image/bad" type="image/jpeg" srcset="/resources/square20.jpg?9">
+    <img src="/resources/square20.jpg?9&preload">
+</picture>
+<!-- Multiple sources -->
+<picture>
+    <source type="image/jpeg" media="(min-width: 1px)" srcset="/resources/square20.jpg?10&preload">
+    <source type="image/jpeg" media="(min-width: 1px)" srcset="/resources/square20.jpg?10&dup">
+    <img src="/resources/square20.jpg?10">
+</picture>
+<picture>
+    <source type="image/bad" media="(min-width: 1px)" srcset="/resources/square20.jpg?11&bad">
+    <source type="image/jpeg" srcset="/resources/square20.jpg?11&preload">
+    <img src="/resources/square20.jpg?11">
+</picture>
+<picture>
+    <source type="image/jpeg" media="(min-width: 1px)" srcset="/resources/square20.jpg?12&preload">
+    <source type="image/bad" media="(min-width: 1px)" srcset="/resources/square20.jpg?12&bad">
+    <img src="/resources/square20.jpg?12">
+</picture>
+<picture>
+    <source type="image/bad" media="(min-width: 1px)" srcset="/resources/square20.jpg?13&bad">
+    <source type="image/invalid" media="(min-width: 1px)" srcset="/resources/square20.jpg?13&invalid">
+    <img src="/resources/square20.jpg?13&preload">
+</picture>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (224927 => 224928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2017-11-16 19:08:37 UTC (rev 224927)
+++ trunk/Source/WebCore/ChangeLog      2017-11-16 19:13:42 UTC (rev 224928)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-11-16  Colin Bendell  <colin@bendell.ca>
+
+        Added mime type check to the picture source preloader to avoid downloading incompatible resources.
+        https://bugs.webkit.org/show_bug.cgi?id=179231
+
+        Reviewed by Alex Christensen.
+
+        Test: http/tests/loading/preload-picture-type.html
+
+        * html/parser/HTMLPreloadScanner.cpp:
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttributes): include type match state when selecting candidate imgs
+        (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute): added type attribute evaluation and matching
+
</ins><span class="cx"> 2017-11-16  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Dispatching an event on a ServiceWorker may fail or crash due to GC
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (224927 => 224928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp  2017-11-16 19:08:37 UTC (rev 224927)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp     2017-11-16 19:13:42 UTC (rev 224928)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "LinkLoader.h"
</span><span class="cx"> #include "LinkRelAttribute.h"
</span><span class="cx"> #include "Logging.h"
</span><ins>+#include "MIMETypeRegistry.h"
</ins><span class="cx"> #include "MediaList.h"
</span><span class="cx"> #include "MediaQueryEvaluator.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx">             processAttribute(attributeName, attributeValue, document, pictureState);
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && !m_srcSetAttribute.isEmpty()) {
</del><ins>+        if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && m_typeMatched && !m_srcSetAttribute.isEmpty()) {
</ins><span class="cx">             
</span><span class="cx">             auto sourceSize = SizesAttributeParser(m_sizesAttribute, document).length();
</span><span class="cx">             ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
</span><span class="lines">@@ -219,6 +220,11 @@
</span><span class="cx">                 LOG(MediaQueries, "HTMLPreloadScanner %p processAttribute evaluating media queries", this);
</span><span class="cx">                 m_mediaMatched = MediaQueryEvaluator { document.printing() ? "print" : "screen", document, documentElement ? documentElement->computedStyle() : nullptr }.evaluate(mediaSet.get());
</span><span class="cx">             }
</span><ins>+            if (match(attributeName, typeAttr) && m_typeAttribute.isNull()) {
+                // when multiple type attributes present: first value wins, ignore subsequent (to match ImageElement parser and Blink behaviours)
+                m_typeAttribute = attributeValue;
+                m_typeMatched &= MIMETypeRegistry::isSupportedImageOrSVGMIMEType(m_typeAttribute);
+            }
</ins><span class="cx">             break;
</span><span class="cx">         case TagId::Script:
</span><span class="cx">             if (match(attributeName, typeAttr)) {
</span><span class="lines">@@ -341,6 +347,7 @@
</span><span class="cx">     String m_srcSetAttribute;
</span><span class="cx">     String m_sizesAttribute;
</span><span class="cx">     bool m_mediaMatched { true };
</span><ins>+    bool m_typeMatched { true };
</ins><span class="cx">     String m_charset;
</span><span class="cx">     String m_crossOriginMode;
</span><span class="cx">     bool m_linkIsStyleSheet;
</span></span></pre>
</div>
</div>

</body>
</html>