Attachment 369733 Details for Bug 197371 – Patch

[patch] Patch

bug-197371-20190513171804.patch (text/plain), 15.29 KB, created by Rob Buis on 2019-05-13 08:18:05 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-05-13 08:18:05 PDT

Size: 15.29 KB

patch

obsolete

>Subversion Revision: 245147
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 3d6de6432880283ef11814398d1bea8d09d7ad55..2f12b1435f93baa05c00e7232a2b823154f32a68 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-05-13  Rob Buis  <rbuis@igalia.com>
>+
>+        Add tests for prefetch redirects
>+        https://bugs.webkit.org/show_bug.cgi?id=197371
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Allow clearing of the Purpose request header field.
>+
>+        Test: http/tests/cache/link-prefetch-main-resource-redirect.html
>+
>+        * platform/network/ResourceRequestBase.cpp:
>+        (WebCore::ResourceRequestBase::clearPurpose):
>+        * platform/network/ResourceRequestBase.h:
>+
> 2019-05-09  Simon Fraser  <simon.fraser@apple.com>
> 
>         fast/hidpi/video-controls-in-hidpi.html sometimes asserts in WK1
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8e056e6bb57702068e8d6bdc4d594f18d7cbbffd..4bc5d23471968524a5d001603d1be85505bdf51f 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,23 @@
>+2019-05-13  Rob Buis  <rbuis@igalia.com>
>+
>+        Store prefetch redirects in the prefetch cache
>+        https://bugs.webkit.org/show_bug.cgi?id=197371
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Store prefetch redirects in the prefetch cache and use them when
>+        navigating.
>+
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        (WebKit::NetworkResourceLoader::retrieveCacheEntry):
>+        (WebKit::NetworkResourceLoader::willSendRedirectedRequest):
>+        (WebKit::NetworkResourceLoader::didFinishWithRedirectResponse):
>+        * NetworkProcess/NetworkResourceLoader.h:
>+        * NetworkProcess/cache/PrefetchCache.cpp:
>+        (WebKit::PrefetchCache::Entry::Entry):
>+        (WebKit::PrefetchCache::storeRedirect):
>+        * NetworkProcess/cache/PrefetchCache.h:
>+
> 2019-05-09  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Unable to commit search on MSN.com, qq.com, or sina.com.cn using enter key (hardware or software keyboard)
>diff --git a/Source/WebCore/platform/network/ResourceRequestBase.cpp b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>index 4dbc37e72717d9df46a3284511b9c2da8f223e6b..619f0847485c1c5a54f3e34c3e53a9fe0b51c404 100644
>--- a/Source/WebCore/platform/network/ResourceRequestBase.cpp
>+++ b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>@@ -357,6 +357,15 @@ void ResourceRequestBase::clearHTTPContentType()
>     m_platformRequestUpdated = false;
> }
> 
>+void ResourceRequestBase::clearPurpose()
>+{
>+    updateResourceRequest();
>+
>+    m_httpHeaderFields.remove(HTTPHeaderName::Purpose);
>+
>+    m_platformRequestUpdated = false;
>+}
>+
> String ResourceRequestBase::httpReferrer() const
> {
>     return httpHeaderField(HTTPHeaderName::Referer);
>diff --git a/Source/WebCore/platform/network/ResourceRequestBase.h b/Source/WebCore/platform/network/ResourceRequestBase.h
>index d98890879f6c3e101bbde2db7bdba845f0264597..dd446a890cdb9dcea7778b1bc28155af6fb6c079 100644
>--- a/Source/WebCore/platform/network/ResourceRequestBase.h
>+++ b/Source/WebCore/platform/network/ResourceRequestBase.h
>@@ -140,6 +140,8 @@ public:
> 
>     void clearHTTPAcceptEncoding();
> 
>+    WEBCORE_EXPORT void clearPurpose();
>+
>     const Vector<String>& responseContentDispositionEncodingFallbackArray() const { return m_responseContentDispositionEncodingFallbackArray; }
>     WEBCORE_EXPORT void setResponseContentDispositionEncodingFallbackArray(const String& encoding1, const String& encoding2 = String(), const String& encoding3 = String());
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index 4510e9268a22c205c8c6b035a7b0fcfe478e06e2..39e023475fc79062554e0e86c1fb831b002b754e 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -214,8 +214,13 @@ void NetworkResourceLoader::retrieveCacheEntry(const ResourceRequest& request)
>     if (isMainFrameLoad()) {
>         ASSERT(m_parameters.options.mode == FetchOptions::Mode::Navigate);
>         if (auto session = m_connection->networkProcess().networkSession(sessionID())) {
>-            if (auto entry = session->prefetchCache().take(request.url()))
>-                m_cache->store(request, entry->response, entry->releaseBuffer(), nullptr);
>+            if (auto entry = session->prefetchCache().take(request.url())) {
>+                if (!entry->redirectRequest.isNull()) {
>+                    auto maxAgeCap = validateCacheEntryForMaxAgeCapValidation(request, entry->redirectRequest, entry->response);
>+                    m_cache->storeRedirect(request, entry->response, entry->redirectRequest, maxAgeCap);
>+                } else
>+                    m_cache->store(request, entry->response, entry->releaseBuffer(), nullptr);
>+            }
>         }
>     }
>     m_cache->retrieve(request, { m_parameters.webPageID, m_parameters.webFrameID }, [this, loader = WTFMove(loader), request = ResourceRequest { request }](auto entry, auto info) mutable {
>@@ -638,7 +643,7 @@ void NetworkResourceLoader::willSendRedirectedRequest(ResourceRequest&& request,
>             }
> 
>             if (m_parameters.options.redirect == FetchOptions::Redirect::Manual) {
>-                this->didFinishWithRedirectResponse(WTFMove(result->redirectResponse));
>+                this->didFinishWithRedirectResponse(WTFMove(result->request), WTFMove(result->redirectRequest), WTFMove(result->redirectResponse));
>                 return;
>             }
> 
>@@ -679,7 +684,7 @@ void NetworkResourceLoader::continueWillSendRedirectedRequest(ResourceRequest&&
>     send(Messages::WebResourceLoader::WillSendRequest(redirectRequest, sanitizeResponseIfPossible(WTFMove(redirectResponse), ResourceResponse::SanitizationType::Redirection)));
> }
> 
>-void NetworkResourceLoader::didFinishWithRedirectResponse(ResourceResponse&& redirectResponse)
>+void NetworkResourceLoader::didFinishWithRedirectResponse(WebCore::ResourceRequest&& request, WebCore::ResourceRequest&& redirectRequest, ResourceResponse&& redirectResponse)
> {
>     redirectResponse.setType(ResourceResponse::Type::Opaqueredirect);
>     didReceiveResponse(WTFMove(redirectResponse), [] (auto) { });
>@@ -690,6 +695,12 @@ void NetworkResourceLoader::didFinishWithRedirectResponse(ResourceResponse&& red
>     networkLoadMetrics.responseBodyDecodedSize = 0;
>     send(Messages::WebResourceLoader::DidFinishResourceLoad { networkLoadMetrics });
> 
>+    if (isCrossOriginPrefetch()) {
>+        if (auto session = m_connection->networkProcess().networkSession(sessionID())) {
>+            redirectRequest.clearPurpose();
>+            session->prefetchCache().storeRedirect(m_networkLoad->currentRequest().url(), WTFMove(redirectResponse), WTFMove(redirectRequest));
>+        }
>+    }
>     cleanup(LoadResult::Success);
> }
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h
>index a8a3005c142306138876821a43a057a0b6f3d7fc..2aabdb377c85611dbefd58a1e90a6733cd460a45 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.h
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.h
>@@ -164,7 +164,7 @@ private:
> #endif
> 
>     void continueWillSendRedirectedRequest(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&, Optional<WebCore::AdClickAttribution::Conversion>&&);
>-    void didFinishWithRedirectResponse(WebCore::ResourceResponse&&);
>+    void didFinishWithRedirectResponse(WebCore::ResourceRequest&&, WebCore::ResourceRequest&& redirectRequest, WebCore::ResourceResponse&&);
>     WebCore::ResourceResponse sanitizeResponseIfPossible(WebCore::ResourceResponse&&, WebCore::ResourceResponse::SanitizationType);
> 
>     // ContentSecurityPolicyClient
>diff --git a/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp b/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp
>index 73cab47f91ee74241f232fffbe3f992df9c56cfc..dfadda1251aae07dc5f7d85eb88b4f16ec04bd2a 100644
>--- a/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/PrefetchCache.cpp
>@@ -35,6 +35,11 @@ PrefetchCache::Entry::Entry(WebCore::ResourceResponse&& response, RefPtr<WebCore
> {
> }
> 
>+PrefetchCache::Entry::Entry(WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& redirectRequest)
>+    : response(WTFMove(redirectResponse)), redirectRequest(WTFMove(redirectRequest))
>+{
>+}
>+
> PrefetchCache::PrefetchCache()
>     : m_expirationTimer(*this, &PrefetchCache::clearExpiredEntries)
> {
>@@ -75,6 +80,16 @@ void PrefetchCache::store(const URL& requestUrl, WebCore::ResourceResponse&& res
>         m_expirationTimer.startOneShot(expirationTimeout);
> }
> 
>+void PrefetchCache::storeRedirect(const URL& requestUrl, WebCore::ResourceResponse&& redirectResponse, WebCore::ResourceRequest&& redirectRequest)
>+{
>+    if (!m_sessionPrefetches)
>+        m_sessionPrefetches = std::make_unique<PrefetchEntriesMap>();
>+    m_sessionPrefetches->set(requestUrl, std::make_unique<PrefetchCache::Entry>(WTFMove(redirectResponse), WTFMove(redirectRequest)));
>+    m_sessionExpirationList.append(std::make_tuple(requestUrl, WallTime::now()));
>+    if (!m_expirationTimer.isActive())
>+        m_expirationTimer.startOneShot(expirationTimeout);
>+}
>+
> void PrefetchCache::clearExpiredEntries()
> {
>     URL requestUrl;
>diff --git a/Source/WebKit/NetworkProcess/cache/PrefetchCache.h b/Source/WebKit/NetworkProcess/cache/PrefetchCache.h
>index c8895fe24b76f8d04adb638c73b1a1c84b2a9c40..f62c2ee830653a7de3b15ec3a63f636be293797b 100644
>--- a/Source/WebKit/NetworkProcess/cache/PrefetchCache.h
>+++ b/Source/WebKit/NetworkProcess/cache/PrefetchCache.h
>@@ -25,6 +25,7 @@
> 
> #pragma once
> 
>+#include <WebCore/ResourceRequest.h>
> #include <WebCore/ResourceResponse.h>
> #include <WebCore/SharedBuffer.h>
> #include <WebCore/Timer.h>
>@@ -46,15 +47,18 @@ public:
> 
>     struct Entry {
>         Entry(WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&);
>+        Entry(WebCore::ResourceResponse&&, WebCore::ResourceRequest&&);
> 
>         Ref<WebCore::SharedBuffer> releaseBuffer() { return buffer.releaseNonNull(); }
> 
>         WebCore::ResourceResponse response;
>         RefPtr<WebCore::SharedBuffer> buffer;
>+        WebCore::ResourceRequest redirectRequest;
>     };
> 
>     std::unique_ptr<Entry> take(const URL&);
>     void store(const URL&, WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&);
>+    void storeRedirect(const URL&, WebCore::ResourceResponse&&, WebCore::ResourceRequest &&);
> 
> private:
>     void clearExpiredEntries();
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index b303f73a11f4e5e0b4c7ac4d5298ffd22fbcd855..f88c73568e34605eefd5d19cd0f3504fb5c55388 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,20 @@
>+2019-05-13  Rob Buis  <rbuis@igalia.com>
>+
>+        Add tests for prefetch redirects
>+        https://bugs.webkit.org/show_bug.cgi?id=197371
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add a test to verify prefetch redirections are cached in the prefetch
>+        cache and reused when navigating.
>+
>+        * http/tests/cache/link-prefetch-main-resource-redirect-expected.txt: Added.
>+        * http/tests/cache/link-prefetch-main-resource-redirect.html: Added.
>+        * http/tests/cache/resources/main-resource-redirect-no-prefetch.php: Added.
>+        * http/tests/cache/resources/prefetched-main-resource-redirect.php: Added.
>+        * platform/mac-wk1/TestExpectations:
>+        * platform/win/TestExpectations:
>+
> 2019-05-09  Daniel Bates  <dabates@apple.com>
> 
>         [iOS] Unable to commit search on MSN.com, qq.com, or sina.com.cn using enter key (hardware or software keyboard)
>diff --git a/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect-expected.txt b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect-expected.txt
>new file mode 100644
>index 0000000000000000000000000000000000000000..7ef22e9a431ad0272713b71fdc8794016c8ef12f
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect-expected.txt
>@@ -0,0 +1 @@
>+PASS
>diff --git a/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect.html b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..6182a728f2d80daa1a949e6f002e0c3b97582743
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/link-prefetch-main-resource-redirect.html
>@@ -0,0 +1,16 @@
>+<html>
>+<script>
>+if (window.testRunner) {
>+    testRunner.waitUntilDone();
>+    testRunner.dumpAsText();
>+}
>+
>+function loadAfterPrefetch()
>+{
>+     window.location.assign('http://localhost:8000/cache/resources/prefetched-main-resource-redirect.php');
>+}
>+</script>
>+<body>
>+<link rel="prefetch" href="http://localhost:8000/cache/resources/prefetched-main-resource-redirect.php" onload="loadAfterPrefetch()">
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/cache/resources/main-resource-redirect-no-prefetch.php b/LayoutTests/http/tests/cache/resources/main-resource-redirect-no-prefetch.php
>new file mode 100644
>index 0000000000000000000000000000000000000000..0247ff6688b22a1e92819635d2ea03ed8105a1aa
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/resources/main-resource-redirect-no-prefetch.php
>@@ -0,0 +1,21 @@
>+<?php
>+    header('HTTP/1.1 ' . 200);
>+?>
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<script>
>+
>+if (window.testRunner)
>+  testRunner.notifyDone();
>+
>+</script>
>+<?php
>+if ($_SERVER["HTTP_PURPOSE"] == "prfetch") {
>+    print('FAIL');
>+} else {
>+    print('PASS');
>+}
>+?>
>+</body>
>+</html>
>diff --git a/LayoutTests/http/tests/cache/resources/prefetched-main-resource-redirect.php b/LayoutTests/http/tests/cache/resources/prefetched-main-resource-redirect.php
>new file mode 100644
>index 0000000000000000000000000000000000000000..9f2056476e7a1471f4811692225e114f1c19e018
>--- /dev/null
>+++ b/LayoutTests/http/tests/cache/resources/prefetched-main-resource-redirect.php
>@@ -0,0 +1,9 @@
>+<?php
>+    header('HTTP/1.1 ' . 302);
>+    header('Cache-Control: max-age=3600');
>+    if ($_SERVER["HTTP_PURPOSE"] == "prefetch") {
>+        header('Location: ' . 'main-resource-redirect-no-prefetch.php');
>+    } else {
>+        print('FAIL');
>+    }
>+?>
>diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index 53658806710303b211507e8dae926eaa6843d844..89a8cca7024911f662f4113db0eafd535f33e237 100644
>--- a/LayoutTests/platform/mac-wk1/TestExpectations
>+++ b/LayoutTests/platform/mac-wk1/TestExpectations
>@@ -705,3 +705,5 @@ webkit.org/b/196915 [ Debug ] inspector/timeline/timeline-recording.html [ Pass
> 
> webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Skip ]
> webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource-iframe.html [ Skip ]
>+
>+webkit.org/b/197371 http/tests/cache/link-prefetch-main-resource-redirect.html [ Skip ]
>diff --git a/LayoutTests/platform/win/TestExpectations b/LayoutTests/platform/win/TestExpectations
>index 48e025b79290b1d79e72bb8840b055ddf0b447be..c1b5cb7d3a8b3421213ce249d9739b76efcbb124 100644
>--- a/LayoutTests/platform/win/TestExpectations
>+++ b/LayoutTests/platform/win/TestExpectations
>@@ -4400,3 +4400,5 @@ webkit.org/b/197310 fast/harness/render-tree-as-text-options.html [ Failure ]
> 
> webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource.html [ Skip ]
> webkit.org/b/195623 http/tests/cache/link-prefetch-main-resource-iframe.html [ Skip ]
>+
>+webkit.org/b/197371 http/tests/cache/link-prefetch-main-resource-redirect.html [ Skip ]

Actions: View | Formatted Diff | Diff

Attachments on bug 197371: 368556 | 368559 | 368560 | 368565 | 368566 | 368568 | 369382 | 369384 | 369386 | 369387 | 369388 | 369418 | 369504 | 369733 | 371728 | 371854 | 372194