Changeset 224703 in webkit

Timestamp:

Nov 10, 2017 2:03:06 PM (6 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r224602 and r224697.
​https://bugs.webkit.org/show_bug.cgi?id=179545

The LayoutTest for this change is flaky. (Requested by
ryanhaddad on #webkit).

Reverted changesets:

"Add tests to ensure that <source> tags are only preloaded
when the type"
​https://bugs.webkit.org/show_bug.cgi?id=179231
​https://trac.webkit.org/changeset/224602

"Fix race conditions with setBackingScaleFactor, page refresh
and preloader"
​https://bugs.webkit.org/show_bug.cgi?id=179488
​https://trac.webkit.org/changeset/224697

Patch by Commit Queue <​commit-queue@webkit.org> on 2017-11-10

Location:

trunk

Files:

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

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-11-10  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224602 and r224697.
+        https://bugs.webkit.org/show_bug.cgi?id=179545
+
+        The LayoutTest for this change is flaky. (Requested by
+        ryanhaddad on #webkit).
+
+        Reverted changesets:
+
+        "Add tests to ensure that <source> tags are only preloaded
+        when the `type`"
+        https://bugs.webkit.org/show_bug.cgi?id=179231
+        https://trac.webkit.org/changeset/224602
+
+        "Fix race conditions with setBackingScaleFactor, page refresh
+        and preloader"
+        https://bugs.webkit.org/show_bug.cgi?id=179488
+        https://trac.webkit.org/changeset/224697
+
 2017-11-10  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-10  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224602 and r224697.
+        https://bugs.webkit.org/show_bug.cgi?id=179545
+
+        The LayoutTest for this change is flaky. (Requested by
+        ryanhaddad on #webkit).
+
+        Reverted changesets:
+
+        "Add tests to ensure that <source> tags are only preloaded
+        when the `type`"
+        https://bugs.webkit.org/show_bug.cgi?id=179231
+        https://trac.webkit.org/changeset/224602
+
+        "Fix race conditions with setBackingScaleFactor, page refresh
+        and preloader"
+        https://bugs.webkit.org/show_bug.cgi?id=179488
+        https://trac.webkit.org/changeset/224697
+
 2017-11-10  Chris Dumez  <cdumez@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"
@@ -123 +122 @@
         }
         
-        if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && m_typeMatched && !m_srcSetAttribute.isEmpty()) {
+        if (m_tagId == TagId::Source && !pictureState.isEmpty() && !pictureState.last() && m_mediaMatched && !m_srcSetAttribute.isEmpty()) {
             
             auto sourceSize = SizesAttributeParser(m_sizesAttribute, document).length();
@@ -220 +219 @@
                 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;
@@ -348 +342 @@
     String m_sizesAttribute;
     bool m_mediaMatched { true };
-    bool m_typeMatched { true };
     String m_charset;
     String m_crossOriginMode;