Changeset 224763 in webkit

Timestamp:

Nov 13, 2017 11:33:19 AM (6 years ago)

Author:

achristensen@apple.com

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 <colin> on 2017-11-13
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> on 2017-11-13
Reviewed by Alex Christensen.

• http/tests/preload/picture-type-expected.txt: Added.
• http/tests/preload/picture-type.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/preload/picture-type-expected.txt (added)
• LayoutTests/http/tests/preload/picture-type.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/parser/HTMLPreloadScanner.cpp (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-11-13  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.
+
 2017-11-13  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-13  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
+
 2017-11-13  Antoine Quint  <graouts@apple.com>
 

trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp

@@ -37 +37 @@
 #include "LinkRelAttribute.h"
 #include "Logging.h"
+#include "MIMETypeRegistry.h"
 #include "MediaList.h"
 #include "MediaQueryEvaluator.h"
@@ -122 +123 @@
         }
         
-        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();
@@ -219 +220 @@
                 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;
@@ -342 +348 @@
     String m_sizesAttribute;
     bool m_mediaMatched { true };
+    bool m_typeMatched { true };
     String m_charset;
     String m_crossOriginMode;