Attachment 361812 Details for Bug 194548 – Patch

[patch] Patch

bug-194548-20190212111958.patch (text/plain), 4.69 KB, created by youenn fablet on 2019-02-12 11:20:01 PST

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-02-12 11:20:01 PST

Size: 4.69 KB

patch

obsolete

>Subversion Revision: 241264
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index bf96746c25f9b788abf00d710fbfbe86e9952048..4a56e97b74493105b647c1f79ffc98e11085fece 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-02-12  Youenn Fablet  <youenn@apple.com>
>+
>+        WebServiceWorkerProvider::handleFetch no longer needs a CachedResource parameter
>+        https://bugs.webkit.org/show_bug.cgi?id=194548
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebProcess/Network/WebLoaderStrategy.cpp:
>+        (WebKit::WebLoaderStrategy::scheduleLoad):
>+        * WebProcess/Storage/WebServiceWorkerProvider.cpp:
>+        (WebKit::WebServiceWorkerProvider::handleFetch):
>+        * WebProcess/Storage/WebServiceWorkerProvider.h:
>+
> 2019-02-12  Youenn Fablet  <youenn@apple.com>
> 
>         Make use of is<SubresourceLoader>
>diff --git a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>index 7678b0c65c9b53bc5474aa8ba020c267f35719c4..901b1d0248f50a8add90ad2593188f954ba48018 100644
>--- a/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>+++ b/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
>@@ -207,7 +207,7 @@ void WebLoaderStrategy::scheduleLoad(ResourceLoader& resourceLoader, CachedResou
> #endif
> 
> #if ENABLE(SERVICE_WORKER)
>-    WebServiceWorkerProvider::singleton().handleFetch(resourceLoader, resource, sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect, [this, trackingParameters, identifier, sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime = maximumBufferingTime(resource), resourceLoader = makeRef(resourceLoader)] (ServiceWorkerClientFetch::Result result) mutable {
>+    WebServiceWorkerProvider::singleton().handleFetch(resourceLoader, sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect, [this, trackingParameters, identifier, sessionID, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime = maximumBufferingTime(resource), resourceLoader = makeRef(resourceLoader)] (ServiceWorkerClientFetch::Result result) mutable {
>         if (result != ServiceWorkerClientFetch::Result::Unhandled) {
>             LOG(NetworkScheduling, "(WebProcess) WebLoaderStrategy::scheduleLoad, url '%s' will be scheduled through ServiceWorker handle fetch algorithm", resourceLoader->url().string().latin1().data());
>             RELEASE_LOG_IF_ALLOWED(resourceLoader.get(), "scheduleLoad: URL will be scheduled through ServiceWorker handle fetch algorithm (frame = %p, pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", resourceLoader->frame(), trackingParameters.pageID, trackingParameters.frameID, identifier);
>diff --git a/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp b/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp
>index 0e9e6ca83c656c10b0dbe8dfdcc5d9cdeaf4bc69..9b7bea375eb6b497182f6414909ed4fa40017adf 100644
>--- a/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp
>+++ b/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.cpp
>@@ -80,7 +80,7 @@ static inline bool shouldHandleFetch(const ResourceLoaderOptions& options)
>     return !!options.serviceWorkerRegistrationIdentifier;
> }
> 
>-void WebServiceWorkerProvider::handleFetch(ResourceLoader& loader, CachedResource* resource, PAL::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect, ServiceWorkerClientFetch::Callback&& callback)
>+void WebServiceWorkerProvider::handleFetch(ResourceLoader& loader, PAL::SessionID sessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect, ServiceWorkerClientFetch::Callback&& callback)
> {
>     if (!SchemeRegistry::canServiceWorkersHandleURLScheme(loader.request().url().protocol().toStringWithoutCopying()) || !shouldHandleFetch(loader.options())) {
>         callback(ServiceWorkerClientFetch::Result::Unhandled);
>diff --git a/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.h b/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.h
>index 271c332d9b7ad3aa7310d1a40c4f330aa044ba41..88e1797a9b57cb080512f61e357c98e7bfe00234 100644
>--- a/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.h
>+++ b/Source/WebKit/WebProcess/Storage/WebServiceWorkerProvider.h
>@@ -41,7 +41,7 @@ class WebServiceWorkerProvider final : public WebCore::ServiceWorkerProvider {
> public:
>     static WebServiceWorkerProvider& singleton();
> 
>-    void handleFetch(WebCore::ResourceLoader&, WebCore::CachedResource*, PAL::SessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect, ServiceWorkerClientFetch::Callback&&);
>+    void handleFetch(WebCore::ResourceLoader&, PAL::SessionID, bool shouldClearReferrerOnHTTPSToHTTPRedirect, ServiceWorkerClientFetch::Callback&&);
>     bool cancelFetch(WebCore::FetchIdentifier);
>     void fetchFinished(WebCore::FetchIdentifier);
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194548: 361812 | 361826