Attachment 372766 Details for Bug 199162 – Patch

[patch] Patch

bug-199162-20190624174945.patch (text/plain), 12.95 KB, created by Rob Buis on 2019-06-24 08:49:46 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Rob Buis

Created: 2019-06-24 08:49:46 PDT

Size: 12.95 KB

patch

obsolete

>Subversion Revision: 246727
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index be3669f837f0142b1964176d55a3801c779bb46b..e5b506a32fcb408f8a9db3898ef200dbd52c589e 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-06-24  Rob Buis  <rbuis@igalia.com>
>+
>+        Cross-origin prefetches should be reused for top-level navigations
>+        https://bugs.webkit.org/show_bug.cgi?id=199162
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Add isPrefetch helper.
>+
>+        * platform/network/ResourceRequestBase.cpp:
>+        (WebCore::ResourceRequestBase::isPrefetch const):
>+        * platform/network/ResourceRequestBase.h:
>+
> 2019-06-23  Simon Fraser  <simon.fraser@apple.com>
> 
>         [Async overflow scroll] Clipped composited layers inside overflow scroll jitter and get incorrectly clipped
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 56d196eb4105cffdb399d47798e2990cfb3c4aa7..1f279a7035d7bf446c0b514d06a6c0d941debffd 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,33 @@
>+2019-06-24  Rob Buis  <rbuis@igalia.com>
>+
>+        Cross-origin prefetches should be reused for top-level navigations
>+        https://bugs.webkit.org/show_bug.cgi?id=199162
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        On navigation, pending loaders are stopped. However pending prefetches
>+        could be fetching the same url the navigation wants. In that case, do
>+        not stop the prefetch load but instead, upon finishing it, use it to
>+        perform the navigation.
>+
>+        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
>+        (WebKit::NetworkConnectionToWebProcess::transferCrossOriginPrefetchLoad):
>+        (WebKit::NetworkConnectionToWebProcess::scheduleResourceLoad):
>+        (WebKit::NetworkConnectionToWebProcess::prefetchFinished):
>+        * NetworkProcess/NetworkConnectionToWebProcess.h:
>+        * NetworkProcess/NetworkResourceLoader.cpp:
>+        (WebKit::NetworkResourceLoader::abort):
>+        (WebKit::NetworkResourceLoader::tryStoreAsCacheEntry):
>+        (WebKit::NetworkResourceLoader::isCrossOriginPrefetch const):
>+        * NetworkProcess/NetworkSession.cpp:
>+        (WebKit::NetworkSession::waitingForPendingPrefetch const):
>+        (WebKit::NetworkSession::addCrossOriginPrefetchLoad):
>+        (WebKit::NetworkSession::takeCrossOriginPrefetchLoad):
>+        (WebKit::NetworkSession::hasPendingNavigation const):
>+        (WebKit::NetworkSession::addPendingNavigation):
>+        (WebKit::NetworkSession::takePendingNavigation):
>+        * NetworkProcess/NetworkSession.h:
>+
> 2019-06-23  Dan Bernstein  <mitz@apple.com>
> 
>         Platform font class gets needlessly initialized in the Networking process
>diff --git a/Source/WebCore/platform/network/ResourceRequestBase.cpp b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>index 619f0847485c1c5a54f3e34c3e53a9fe0b51c404..df09a1b1f07e96bf06fc8b18de225f23a7228dbd 100644
>--- a/Source/WebCore/platform/network/ResourceRequestBase.cpp
>+++ b/Source/WebCore/platform/network/ResourceRequestBase.cpp
>@@ -270,6 +270,11 @@ void ResourceRequestBase::setIsTopSite(bool isTopSite)
>     m_platformRequestUpdated = false;
> }
> 
>+bool ResourceRequestBase::isPrefetch() const
>+{
>+    return httpHeaderField(HTTPHeaderName::Purpose) == "prefetch";
>+}
>+
> const String& ResourceRequestBase::httpMethod() const
> {
>     updateResourceRequest(); 
>diff --git a/Source/WebCore/platform/network/ResourceRequestBase.h b/Source/WebCore/platform/network/ResourceRequestBase.h
>index dd446a890cdb9dcea7778b1bc28155af6fb6c079..699df9d226f1625a06d8e3949c92aed5f7475fdb 100644
>--- a/Source/WebCore/platform/network/ResourceRequestBase.h
>+++ b/Source/WebCore/platform/network/ResourceRequestBase.h
>@@ -90,6 +90,8 @@ public:
>     WEBCORE_EXPORT bool isTopSite() const; // Whether this request is for a top-level navigation.
>     WEBCORE_EXPORT void setIsTopSite(bool);
> 
>+    WEBCORE_EXPORT bool isPrefetch() const;
>+
>     WEBCORE_EXPORT const String& httpMethod() const;
>     WEBCORE_EXPORT void setHTTPMethod(const String& httpMethod);
>     
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>index 5992639caa2e1ba3bd12b014098955cb0de73dc9..347a7c05bdccb7db462c5db9c0c073a9b969cbab 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp
>@@ -134,6 +134,17 @@ void NetworkConnectionToWebProcess::transferKeptAliveLoad(NetworkResourceLoader&
>         m_networkProcess->addKeptAliveLoad(takenLoader.releaseNonNull());
> }
> 
>+void NetworkConnectionToWebProcess::transferCrossOriginPrefetchLoad(NetworkResourceLoader& loader)
>+{
>+    RELEASE_ASSERT(RunLoop::isMain());
>+    ASSERT(loader.isKeptAlive());
>+    ASSERT(m_networkResourceLoaders.get(loader.identifier()) == &loader);
>+    if (auto takenLoader = m_networkResourceLoaders.take(loader.identifier())) {
>+        if (auto session = networkProcess().networkSession(loader.sessionID()))
>+            session->addCrossOriginPrefetchLoad(takenLoader.releaseNonNull());
>+    }
>+}
>+
> void NetworkConnectionToWebProcess::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
> {
>     if (decoder.messageReceiverName() == Messages::NetworkConnectionToWebProcess::messageReceiverName()) {
>@@ -407,6 +418,16 @@ void NetworkConnectionToWebProcess::scheduleResourceLoad(NetworkResourceLoadPara
>     RELEASE_ASSERT(RunLoop::isMain());
>     ASSERT(!m_networkResourceLoaders.contains(identifier));
> 
>+    if (loadParameters.options.mode == FetchOptions::Mode::Navigate) {
>+        if (auto session = networkProcess().networkSession(loadParameters.sessionID)) {
>+            auto url = loadParameters.request.url();
>+            if (session->waitingForPendingPrefetch(url)) {
>+                session->addPendingNavigation(url, WTFMove(loadParameters));
>+                return;
>+            }
>+        }
>+    }
>+
>     auto loader = NetworkResourceLoader::create(WTFMove(loadParameters), *this);
>     m_networkResourceLoaders.add(identifier, loader.copyRef());
>     loader->start();
>@@ -913,4 +934,19 @@ void NetworkConnectionToWebProcess::webProcessSessionChanged(PAL::SessionID newS
>     m_networkProcess->webProcessSessionChanged(m_connection.get(), newSessionID, pages);
> }
> 
>+void NetworkConnectionToWebProcess::prefetchFinished(const PAL::SessionID& sessionID, const URL& url, WebCore::ResourceResponse&& response, RefPtr<WebCore::SharedBuffer>&& buffer)
>+{
>+    if (auto session = networkProcess().networkSession(sessionID)) {
>+        session->prefetchCache().store(url, WTFMove(response), WTFMove(buffer));
>+        if (session->hasPendingNavigation(url)) {
>+            if (auto crossOriginPrefetch = session->takeCrossOriginPrefetchLoad(url))
>+                m_networkResourceLoaders.add(crossOriginPrefetch->identifier(), crossOriginPrefetch.releaseNonNull());
>+            auto loadParameters = session->takePendingNavigation(url);
>+            auto loader = NetworkResourceLoader::create(WTFMove(loadParameters), *this);
>+            m_networkResourceLoaders.add(loadParameters.identifier, loader.copyRef());
>+            loader->start();
>+        }
>+    }
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>index 19e76723781bfeb470fb2622b93eca74e9aeee8c..7903dadcbc2c6f32a68e6da949ec7c848aeafc39 100644
>--- a/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>+++ b/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h
>@@ -87,6 +87,7 @@ public:
> 
>     void didCleanupResourceLoader(NetworkResourceLoader&);
>     void transferKeptAliveLoad(NetworkResourceLoader&);
>+    void transferCrossOriginPrefetchLoad(NetworkResourceLoader&);
>     void setOnLineState(bool);
> 
>     bool captureExtraNetworkLoadMetricsEnabled() const { return m_captureExtraNetworkLoadMetricsEnabled; }
>@@ -148,6 +149,8 @@ public:
> 
>     void removeSocketChannel(uint64_t identifier);
> 
>+    void prefetchFinished(const PAL::SessionID&, const URL&, WebCore::ResourceResponse&&, RefPtr<WebCore::SharedBuffer>&&);
>+
> private:
>     NetworkConnectionToWebProcess(NetworkProcess&, IPC::Connection::Identifier);
> 
>diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>index 0b3c081ec8321f74d779dbd43d9c770202a89a80..e2e4c9321918a669a8bbc802a3d915e5061c87c7 100644
>--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
>@@ -353,6 +353,11 @@ void NetworkResourceLoader::abort()
>         return;
>     }
> 
>+    if (isCrossOriginPrefetch()) {
>+        m_connection->transferCrossOriginPrefetchLoad(*this);
>+        return;
>+    }
>+
>     if (m_networkLoad) {
>         if (canUseCache(m_networkLoad->currentRequest())) {
>             // We might already have used data from this incomplete load. Ensure older versions don't remain in the cache after cancel.
>@@ -820,8 +825,7 @@ void NetworkResourceLoader::tryStoreAsCacheEntry()
>         return;
> 
>     if (isCrossOriginPrefetch()) {
>-        if (auto session = m_connection->networkProcess().networkSession(sessionID()))
>-            session->prefetchCache().store(m_networkLoad->currentRequest().url(), WTFMove(m_response), WTFMove(m_bufferedDataForCache));
>+        m_connection->prefetchFinished(sessionID(), m_networkLoad->currentRequest().url(), WTFMove(m_response), WTFMove(m_bufferedDataForCache));
>         return;
>     }
>     m_cache->store(m_networkLoad->currentRequest(), m_response, WTFMove(m_bufferedDataForCache), [loader = makeRef(*this)](auto& mappedBody) mutable {
>@@ -1162,7 +1166,7 @@ void NetworkResourceLoader::logSlowCacheRetrieveIfNeeded(const NetworkCache::Cac
> bool NetworkResourceLoader::isCrossOriginPrefetch() const
> {
>     auto request = originalRequest();
>-    return request.httpHeaderField(HTTPHeaderName::Purpose) == "prefetch" && !m_parameters.sourceOrigin->canRequest(request.url());
>+    return request.isPrefetch() && !m_parameters.sourceOrigin->canRequest(request.url());
> }
> 
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkSession.cpp b/Source/WebKit/NetworkProcess/NetworkSession.cpp
>index 804805baeea08ae1a2dcb2542c8096cdea79ac03..c6fb54d34c38aef546b849b33f27a2e69b4c67a7 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSession.cpp
>+++ b/Source/WebKit/NetworkProcess/NetworkSession.cpp
>@@ -221,4 +221,37 @@ std::unique_ptr<WebSocketTask> NetworkSession::createWebSocketTask(NetworkSocket
>     return nullptr;
> }
> 
>+bool NetworkSession::waitingForPendingPrefetch(const URL& url) const
>+{
>+    return m_pendingCrossOriginPrefetchLoads.contains(url);
>+}
>+
>+void NetworkSession::addCrossOriginPrefetchLoad(Ref<NetworkResourceLoader>&& loader)
>+{
>+    auto url = loader->originalRequest().url();
>+    m_pendingCrossOriginPrefetchLoads.add(url, WTFMove(loader));
>+}
>+
>+RefPtr<NetworkResourceLoader> NetworkSession::takeCrossOriginPrefetchLoad(const URL& url)
>+{
>+    if (auto ret = m_pendingCrossOriginPrefetchLoads.take(url))
>+        return WTFMove(*ret);
>+    return nullptr;
>+}
>+
>+bool NetworkSession::hasPendingNavigation(const URL& url) const
>+{
>+    return m_pendingNavigations.contains(url);
>+}
>+
>+void NetworkSession::addPendingNavigation(const URL& url, NetworkResourceLoadParameters&& parameters)
>+{
>+    m_pendingNavigations.add(url, WTFMove(parameters));
>+}
>+
>+NetworkResourceLoadParameters NetworkSession::takePendingNavigation(const URL& url)
>+{
>+    return m_pendingNavigations.take(url);
>+}
>+
> } // namespace WebKit
>diff --git a/Source/WebKit/NetworkProcess/NetworkSession.h b/Source/WebKit/NetworkProcess/NetworkSession.h
>index f521ad3caff02943416a950cef7d5f96bbc59385..d22608700669a642b9aef26442e4c86a77d1eba5 100644
>--- a/Source/WebKit/NetworkProcess/NetworkSession.h
>+++ b/Source/WebKit/NetworkProcess/NetworkSession.h
>@@ -52,6 +52,7 @@ class AdClickAttributionManager;
> class NetworkDataTask;
> class NetworkProcess;
> class NetworkResourceLoader;
>+class NetworkResourceLoadParameters;
> class StorageManager;
> class NetworkSocketChannel;
> class WebResourceLoadStatisticsStore;
>@@ -107,6 +108,14 @@ public:
>     virtual void removeWebSocketTask(WebSocketTask&) { }
>     virtual void addWebSocketTask(WebSocketTask&) { }
> 
>+    bool waitingForPendingPrefetch(const URL&) const;
>+    void addCrossOriginPrefetchLoad(Ref<NetworkResourceLoader>&&);
>+    RefPtr<NetworkResourceLoader> takeCrossOriginPrefetchLoad(const URL&);
>+
>+    void addPendingNavigation(const URL&, NetworkResourceLoadParameters&&);
>+    bool hasPendingNavigation(const URL&) const;
>+    NetworkResourceLoadParameters takePendingNavigation(const URL&);
>+
> protected:
>     NetworkSession(NetworkProcess&, PAL::SessionID, const String& localStorageDirectory, SandboxExtension::Handle&);
> 
>@@ -124,6 +133,10 @@ protected:
> 
>     HashSet<Ref<NetworkResourceLoader>> m_keptAliveLoads;
> 
>+    HashMap<URL, Ref<NetworkResourceLoader>> m_pendingCrossOriginPrefetchLoads;
>+
>+    HashMap<URL, NetworkResourceLoadParameters> m_pendingNavigations;
>+
>     PrefetchCache m_prefetchCache;
> 
>     Ref<StorageManager> m_storageManager;

Actions: View | Formatted Diff | Diff

Attachments on bug 199162: 372766 | 372854 | 372908 | 372909 | 372910 | 372911 | 372936 | 373213 | 373229 | 373384 | 373388 | 375031 | 377007 | 377008 | 377011 | 377106 | 377150 | 380610 | 380617 | 380711 | 391646 | 408325