Title: [224928] trunk
- Revision
- 224928
- Author
- [email protected]
- Date
- 2017-11-16 11:13:42 -0800 (Thu, 16 Nov 2017)
Log Message
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 <[email protected]> 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 <[email protected]> on 2017-11-16
Reviewed by Alex Christensen.
* http/tests/preload/picture-type-expected.txt: Added.
* http/tests/preload/picture-type.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (224927 => 224928)
--- trunk/LayoutTests/ChangeLog 2017-11-16 19:08:37 UTC (rev 224927)
+++ trunk/LayoutTests/ChangeLog 2017-11-16 19:13:42 UTC (rev 224928)
@@ -1,3 +1,14 @@
+2017-11-16 Colin Bendell <[email protected]>
+
+ 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.
+
2017-11-16 Chris Dumez <[email protected]>
Dispatching an event on a ServiceWorker may fail or crash due to GC
Added: trunk/LayoutTests/http/tests/preload/picture-type-expected.txt (0 => 224928)
--- 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)
@@ -0,0 +1,40 @@
+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
+
Added: trunk/LayoutTests/http/tests/preload/picture-type.html (0 => 224928)
--- 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)
@@ -0,0 +1,132 @@
+<html>
+<head>
+ <script>
+ if (window.testRunner && window.internals) {
+ testRunner.dumpAsText();
+ internals.clearMemoryCache();
+ }
+ </script>
+
+ <script src=""
+ <script src=""
+</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=""
+</picture>
+<!-- All permutations of type, media, srcset and sizes -->
+
+<picture>
+ <source type="image/jpeg" srcset="/resources/square20.jpg?1&preload">
+ <img src=""
+</picture>
+<picture>
+ <source srcset="/resources/square20.jpg?2&preload" type="image/jpeg">
+ <img src=""
+</picture>
+<picture>
+ <source type="image/bad" srcset="/resources/square20.jpg?3">
+ <img src=""
+</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=""
+</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=""
+</picture>
+<picture>
+ <source type="image/jpeg" media="(min-width: 1px)" srcset="/resources/square20.jpg?6&preload">
+ <img src=""
+</picture>
+<picture>
+ <source type="image/bad" media="(min-width: 1px)" srcset="/resources/square20.jpg?7">
+ <img src=""
+</picture>
+
+<!-- Duplicate attributes -->
+<picture>
+ <source type="image/jpeg" type="image/bad" srcset="/resources/square20.jpg?8&preload">
+ <img src=""
+</picture>
+<picture>
+ <source type="image/bad" type="image/jpeg" srcset="/resources/square20.jpg?9">
+ <img src=""
+</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=""
+</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=""
+</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=""
+</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=""
+</picture>
+
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (224927 => 224928)
--- 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)
@@ -1,3 +1,16 @@
+2017-11-16 Colin Bendell <[email protected]>
+
+ 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
+
2017-11-16 Chris Dumez <[email protected]>
Dispatching an event on a ServiceWorker may fail or crash due to GC
Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (224927 => 224928)
--- 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)
@@ -36,6 +36,7 @@
#include "LinkLoader.h"
#include "LinkRelAttribute.h"
#include "Logging.h"
+#include "MIMETypeRegistry.h"
#include "MediaList.h"
#include "MediaQueryEvaluator.h"
#include "RenderView.h"
@@ -121,7 +122,7 @@
processAttribute(attributeName, attributeValue, document, pictureState);
}
- if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && !m_srcSetAttribute.isEmpty()) {
+ if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && m_typeMatched && !m_srcSetAttribute.isEmpty()) {
auto sourceSize = SizesAttributeParser(m_sizesAttribute, document).length();
ImageCandidate imageCandidate = bestFitSourceForImageAttributes(m_deviceScaleFactor, m_urlToLoad, m_srcSetAttribute, sourceSize);
@@ -219,6 +220,11 @@
LOG(MediaQueries, "HTMLPreloadScanner %p processAttribute evaluating media queries", this);
m_mediaMatched = MediaQueryEvaluator { document.printing() ? "print" : "screen", document, documentElement ? documentElement->computedStyle() : nullptr }.evaluate(mediaSet.get());
}
+ 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);
+ }
break;
case TagId::Script:
if (match(attributeName, typeAttr)) {
@@ -341,6 +347,7 @@
String m_srcSetAttribute;
String m_sizesAttribute;
bool m_mediaMatched { true };
+ bool m_typeMatched { true };
String m_charset;
String m_crossOriginMode;
bool m_linkIsStyleSheet;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
