Changeset 227261 in webkit

Timestamp:

Jan 19, 2018 7:55:15 PM (6 years ago)

Author:

Ryan Haddad

Message:

Unreviewed, rolling out r227235.

The test for this change consistently times out on High
Sierra.

Reverted changeset:

"Support for preconnect Link headers"
​https://bugs.webkit.org/show_bug.cgi?id=181657
​https://trac.webkit.org/changeset/227235

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http-expected.txt (deleted)
• LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http.html (deleted)
• LayoutTests/http/tests/preconnect/resources (deleted)
• LayoutTests/platform/ios-simulator/TestExpectations (modified) (1 diff)
• LayoutTests/platform/win/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/LinkLoader.cpp (modified) (3 diffs)
• Source/WebCore/loader/LinkLoader.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-01-19  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r227235.
+
+        The test for this change consistently times out on High
+        Sierra.
+
+        Reverted changeset:
+
+        "Support for preconnect Link headers"
+        https://bugs.webkit.org/show_bug.cgi?id=181657
+        https://trac.webkit.org/changeset/227235
+
 2018-01-19  Andy Estes  <aestes@apple.com>
 

trunk/LayoutTests/platform/ios-simulator/TestExpectations

@@ -60 +60 @@
 webgl/1.0.2/conformance/uniforms/uniform-default-values.html [ Failure ]
 
-# ios-simulator does not process link headers for subresources
-webkit.org/b/181789 http/tests/preconnect/link-header-rel-preconnect-http.html [ Skip ]
-
 # This test requires Skia, which isn't available on iOS.
 webkit.org/b/174079 fast/text/variations/skia-postscript-name.html [ ImageOnlyFailure ]

trunk/LayoutTests/platform/win/TestExpectations

@@ -3787 +3787 @@
 # preconnect tests are failing on Windows.
 webkit.org/b/177626 fast/dom/HTMLLinkElement/preconnect-support.html  [ Skip ]
-webkit.org/b/177626 http/tests/preconnect/ [ Skip ]
+webkit.org/b/177626 http/tests/preconnect/link-rel-preconnect-http.html [ Skip ]
+webkit.org/b/177626 http/tests/preconnect/link-rel-preconnect-https.html [ Skip ]
 
 webkit.org/b/177964 fast/text/font-display/block-nofinish.html [ Pass ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-01-19  Ryan Haddad  <ryanhaddad@apple.com>
+
+        Unreviewed, rolling out r227235.
+
+        The test for this change consistently times out on High
+        Sierra.
+
+        Reverted changeset:
+
+        "Support for preconnect Link headers"
+        https://bugs.webkit.org/show_bug.cgi?id=181657
+        https://trac.webkit.org/changeset/227235
+
 2018-01-19  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/loader/LinkLoader.cpp

@@ -111 +111 @@
         if (equalIgnoringFragmentIdentifier(url, baseURL))
             continue;
-        preconnectIfNeeded(relAttribute, url, document, header.crossOrigin());
         preloadIfNeeded(relAttribute, url, document, header.as(), header.media(), header.mimeType(), header.crossOrigin(), nullptr);
     }
@@ -213 +212 @@
 }
 
-void LinkLoader::preconnectIfNeeded(const LinkRelAttribute& relAttribute, const URL& href, Document& document, const String& crossOrigin)
-{
-    if (!relAttribute.isLinkPreconnect || !href.isValid() || !href.protocolIsInHTTPFamily() || !document.frame())
-        return;
-    ASSERT(document.settings().linkPreconnectEnabled());
-    StoredCredentialsPolicy storageCredentialsPolicy = StoredCredentialsPolicy::Use;
-    if (equalIgnoringASCIICase(crossOrigin, "anonymous") && document.securityOrigin().canAccess(SecurityOrigin::create(href)))
-        storageCredentialsPolicy = StoredCredentialsPolicy::DoNotUse;
-    ASSERT(document.frame()->loader().networkingContext());
-    platformStrategies()->loaderStrategy()->preconnectTo(*document.frame()->loader().networkingContext(), href, storageCredentialsPolicy, [weakDocument = document.createWeakPtr(), href](ResourceError error) {
-        if (!weakDocument)
-            return;
-
-        if (!error.isNull())
-            weakDocument->addConsoleMessage(MessageSource::Network, MessageLevel::Error, makeString(ASCIILiteral("Failed to preconnect to "), href.string(), ASCIILiteral(". Error: "), error.localizedDescription()));
-        else
-            weakDocument->addConsoleMessage(MessageSource::Network, MessageLevel::Info, makeString(ASCIILiteral("Successfuly preconnected to "), href.string()));
-    });
-}
-
 std::unique_ptr<LinkPreloadResourceClient> LinkLoader::preloadIfNeeded(const LinkRelAttribute& relAttribute, const URL& href, Document& document, const String& as, const String& media, const String& mimeType, const String& crossOriginMode, LinkLoader* loader)
 {
@@ -281 +260 @@
     }
 
-    preconnectIfNeeded(relAttribute, href, document, crossOrigin);
+    if (relAttribute.isLinkPreconnect && href.isValid() && href.protocolIsInHTTPFamily() && document.frame()) {
+        ASSERT(document.settings().linkPreconnectEnabled());
+        StoredCredentialsPolicy storageCredentialsPolicy = StoredCredentialsPolicy::Use;
+        if (equalIgnoringASCIICase(crossOrigin, "anonymous") && document.securityOrigin().canAccess(SecurityOrigin::create(href)))
+            storageCredentialsPolicy = StoredCredentialsPolicy::DoNotUse;
+        ASSERT(document.frame()->loader().networkingContext());
+        platformStrategies()->loaderStrategy()->preconnectTo(*document.frame()->loader().networkingContext(), href, storageCredentialsPolicy, [weakDocument = document.createWeakPtr(), href](ResourceError error) {
+            if (!weakDocument)
+                return;
+
+            if (!error.isNull())
+                weakDocument->addConsoleMessage(MessageSource::Network, MessageLevel::Error, makeString(ASCIILiteral("Failed to preconnect to "), href.string(), ASCIILiteral(". Error: "), error.localizedDescription()));
+            else
+                weakDocument->addConsoleMessage(MessageSource::Network, MessageLevel::Info, makeString(ASCIILiteral("Successfuly preconnected to "), href.string()));
+        });
+    }
 
     if (m_client.shouldLoadLink()) {

trunk/Source/WebCore/loader/LinkLoader.h

@@ -65 +65 @@
 private:
     void notifyFinished(CachedResource&) override;
-    static void preconnectIfNeeded(const LinkRelAttribute&, const URL& href, Document&, const String& crossOrigin);
     static std::unique_ptr<LinkPreloadResourceClient> preloadIfNeeded(const LinkRelAttribute&, const URL& href, Document&, const String& as, const String& media, const String& type, const String& crossOriginMode, LinkLoader*);