Title: [251126] trunk/Source/WebKit
- Revision
- 251126
- Author
- you...@apple.com
- Date
- 2019-10-15 01:59:11 -0700 (Tue, 15 Oct 2019)
Log Message
Handle service worker loads through NetworkResourceLoader
https://bugs.webkit.org/show_bug.cgi?id=202309
Unreviewed.
Fix !ENABLE(SERVICE_WORKER) builds.
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::continueWillSendRequest):
(WebKit::NetworkResourceLoader::continueDidReceiveResponse):
(WebKit::NetworkResourceLoader::serviceWorkerDidNotHandle):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (251125 => 251126)
--- trunk/Source/WebKit/ChangeLog 2019-10-15 08:43:19 UTC (rev 251125)
+++ trunk/Source/WebKit/ChangeLog 2019-10-15 08:59:11 UTC (rev 251126)
@@ -1,3 +1,16 @@
+2019-10-15 youenn fablet <you...@apple.com>
+
+ Handle service worker loads through NetworkResourceLoader
+ https://bugs.webkit.org/show_bug.cgi?id=202309
+
+ Unreviewed.
+ Fix !ENABLE(SERVICE_WORKER) builds.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::continueWillSendRequest):
+ (WebKit::NetworkResourceLoader::continueDidReceiveResponse):
+ (WebKit::NetworkResourceLoader::serviceWorkerDidNotHandle):
+
2019-10-14 Youenn Fablet <you...@apple.com>
Handle service worker loads through NetworkResourceLoader
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (251125 => 251126)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-10-15 08:43:19 UTC (rev 251125)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2019-10-15 08:59:11 UTC (rev 251126)
@@ -760,10 +760,12 @@
void NetworkResourceLoader::continueWillSendRequest(ResourceRequest&& newRequest, bool isAllowedToAskUserForCredentials)
{
+#if ENABLE(SERVICE_WORKER)
if (m_serviceWorkerFetchTask) {
m_serviceWorkerFetchTask->continueFetchTaskWith(WTFMove(newRequest));
return;
}
+#endif
if (m_shouldRestartLoad) {
m_shouldRestartLoad = false;
@@ -809,10 +811,12 @@
void NetworkResourceLoader::continueDidReceiveResponse()
{
+#if ENABLE(SERVICE_WORKER)
if (m_serviceWorkerFetchTask) {
m_serviceWorkerFetchTask->continueDidReceiveFetchResponse();
return;
}
+#endif
if (m_cacheEntryWaitingForContinueDidReceiveResponse) {
sendResultForCacheEntry(WTFMove(m_cacheEntryWaitingForContinueDidReceiveResponse));
@@ -1240,7 +1244,6 @@
m_serviceWorkerFetchTask = nullptr;
start();
}
-
#endif
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
