Changeset 224541 in webkit
- Timestamp:
- Nov 7, 2017 12:02:48 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r224538 r224541 1 2017-11-07 Ryan Haddad <ryanhaddad@apple.com> 2 3 Unreviewed, rolling out r224498. 4 5 The LayoutTest for this change is flaky and affecting EWS 6 results. 7 8 Reverted changeset: 9 10 "Add tests to ensure that <source> tags are only preloaded 11 when the `type`" 12 https://bugs.webkit.org/show_bug.cgi?id=179231 13 https://trac.webkit.org/changeset/224498 14 1 15 2017-11-07 Chris Dumez <cdumez@apple.com> 2 16 -
trunk/Source/WebCore/ChangeLog
r224540 r224541 1 2017-11-07 Ryan Haddad <ryanhaddad@apple.com> 2 3 Unreviewed, rolling out r224498. 4 5 The LayoutTest for this change is flaky and affecting EWS 6 results. 7 8 Reverted changeset: 9 10 "Add tests to ensure that <source> tags are only preloaded 11 when the `type`" 12 https://bugs.webkit.org/show_bug.cgi?id=179231 13 https://trac.webkit.org/changeset/224498 14 1 15 2017-11-07 Joseph Pecoraro <pecoraro@apple.com> 2 16 -
trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp
r224498 r224541 37 37 #include "LinkRelAttribute.h" 38 38 #include "Logging.h" 39 #include "MIMETypeRegistry.h"40 39 #include "MediaList.h" 41 40 #include "MediaQueryEvaluator.h" … … 123 122 } 124 123 125 if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && m_typeMatched &&!m_srcSetAttribute.isEmpty()) {124 if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && !m_srcSetAttribute.isEmpty()) { 126 125 127 126 auto sourceSize = SizesAttributeParser(m_sizesAttribute, document).length(); … … 220 219 LOG(MediaQueries, "HTMLPreloadScanner %p processAttribute evaluating media queries", this); 221 220 m_mediaMatched = MediaQueryEvaluator { document.printing() ? "print" : "screen", document, documentElement ? documentElement->computedStyle() : nullptr }.evaluate(mediaSet.get()); 222 }223 if (match(attributeName, typeAttr) && m_typeAttribute.isNull()) {224 // when multiple type attributes present: first value wins, ignore subsequent (to match ImageElement parser and Blink behaviours)225 m_typeAttribute = attributeValue;226 m_typeMatched &= MIMETypeRegistry::isSupportedImageOrSVGMIMEType(m_typeAttribute);227 221 } 228 222 break; … … 348 342 String m_sizesAttribute; 349 343 bool m_mediaMatched { true }; 350 bool m_typeMatched { true };351 344 String m_charset; 352 345 String m_crossOriginMode;
Note: See TracChangeset
for help on using the changeset viewer.