Log 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
Modified Paths
- trunk/LayoutTests/ChangeLog
- trunk/LayoutTests/platform/ios-simulator/TestExpectations
- trunk/LayoutTests/platform/win/TestExpectations
- trunk/Source/WebCore/ChangeLog
- trunk/Source/WebCore/loader/LinkLoader.cpp
- trunk/Source/WebCore/loader/LinkLoader.h
Removed Paths
- trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http-expected.txt
- trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http.html
- trunk/LayoutTests/http/tests/preconnect/resources/
Diff
Modified: trunk/LayoutTests/ChangeLog (227260 => 227261)
--- trunk/LayoutTests/ChangeLog 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/LayoutTests/ChangeLog 2018-01-20 03:55:15 UTC (rev 227261)
@@ -1,3 +1,16 @@
+2018-01-19 Ryan Haddad <ryanhad...@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 <aes...@apple.com>
[Sierra Debug WK2] ASSERTION FAILED: paymentCoordinator().supportsVersion(version)
Deleted: trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http-expected.txt (227260 => 227261)
--- trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http-expected.txt 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http-expected.txt 2018-01-20 03:55:15 UTC (rev 227261)
@@ -1,10 +0,0 @@
-CONSOLE MESSAGE: Successfuly preconnected to http://localhost:8000/
-Tests that Link header's rel=preconnect works as expected over HTTP.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http.html (227260 => 227261)
--- trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http.html 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/LayoutTests/http/tests/preconnect/link-header-rel-preconnect-http.html 2018-01-20 03:55:15 UTC (rev 227261)
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<script src=""
-</head>
-<body>
-<script>
-description("Tests that Link header's rel=preconnect works as expected over HTTP.");
-jsTestIsAsync = true;
-
-// If the feature is not supported on this platform, fail without a timeout.
-if (!document.createElement("link").relList.supports("preconnect"))
- finishJSTest();
-
-internals.setConsoleMessageListener(function() {
- finishJSTest();
-});
-var script = document.createElement("script");
-script.src = ""
-document.body.appendChild(script);
-</script>
-</body>
-</html>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (227260 => 227261)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2018-01-20 03:55:15 UTC (rev 227261)
@@ -59,8 +59,5 @@
# WebGL tests which need triaging https://bugs.webkit.org/b/174100
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 ]
Modified: trunk/LayoutTests/platform/win/TestExpectations (227260 => 227261)
--- trunk/LayoutTests/platform/win/TestExpectations 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/LayoutTests/platform/win/TestExpectations 2018-01-20 03:55:15 UTC (rev 227261)
@@ -3786,7 +3786,8 @@
# 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 ]
webkit.org/b/177964 fast/text/font-display/failure-finish.html [ Pass ImageOnlyFailure ]
Modified: trunk/Source/WebCore/ChangeLog (227260 => 227261)
--- trunk/Source/WebCore/ChangeLog 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/Source/WebCore/ChangeLog 2018-01-20 03:55:15 UTC (rev 227261)
@@ -1,3 +1,16 @@
+2018-01-19 Ryan Haddad <ryanhad...@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 <you...@apple.com>
Cache storage errors like Quota should trigger console messages
Modified: trunk/Source/WebCore/loader/LinkLoader.cpp (227260 => 227261)
--- trunk/Source/WebCore/loader/LinkLoader.cpp 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/Source/WebCore/loader/LinkLoader.cpp 2018-01-20 03:55:15 UTC (rev 227261)
@@ -110,7 +110,6 @@
// Sanity check to avoid re-entrancy here.
if (equalIgnoringFragmentIdentifier(url, baseURL))
continue;
- preconnectIfNeeded(relAttribute, url, document, header.crossOrigin());
preloadIfNeeded(relAttribute, url, document, header.as(), header.media(), header.mimeType(), header.crossOrigin(), nullptr);
}
}
@@ -212,26 +211,6 @@
return false;
}
-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)
{
if (!document.loader() || !relAttribute.isLinkPreload)
@@ -280,8 +259,23 @@
document.frame()->loader().client().prefetchDNS(href.host());
}
- 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()) {
auto resourceClient = preloadIfNeeded(relAttribute, href, document, as, media, mimeType, crossOrigin, this);
if (resourceClient)
Modified: trunk/Source/WebCore/loader/LinkLoader.h (227260 => 227261)
--- trunk/Source/WebCore/loader/LinkLoader.h 2018-01-20 03:50:34 UTC (rev 227260)
+++ trunk/Source/WebCore/loader/LinkLoader.h 2018-01-20 03:55:15 UTC (rev 227261)
@@ -64,7 +64,6 @@
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*);
LinkLoaderClient& m_client;
_______________________________________________ webkit-changes mailing list webkit-changes@lists.webkit.org https://lists.webkit.org/mailman/listinfo/webkit-changes
