commit b1eea1181bb760af678f78727500f600d3603fc4
author youenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Oct 15 08:59:11 2019 +0000
committer youenn@apple.com <youenn@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Oct 15 08:59:11 2019 +0000
tree 5910e33b6fe4013b47fcf8315cfe86a819f1f15f
parent db429512421596470240ded3a71f70ee20552ab3

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):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@251126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/ChangeLog

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 937f98a..59a0d85 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,16 @@
+2019-10-15  youenn fablet  <youenn@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  <youenn@apple.com>
 
         Handle service worker loads through NetworkResourceLoader

Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

diff --git a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
index 8797939..d334db6 100644
--- a/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
+++ b/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp
@@ -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