Changeset 266990 in webkit

Timestamp:

Sep 13, 2020 1:13:14 AM (4 years ago)

Author:

Pablo Saavedra

Message:

[GTK][WPE] Build fails when -DENABLE_SERVICE_WORKER=OFF
​https://bugs.webkit.org/show_bug.cgi?id=216455

Unreviewed build fix.

• UIProcess/API/glib/WebKitWebsiteData.cpp:

(recordContainsSupportedDataTypes):
(toWebKitWebsiteDataTypes):

• UIProcess/API/glib/WebKitWebsiteDataManager.cpp:

(toWebsiteDataTypes):

• WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::WebLoaderStrategy::scheduleLoad):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/glib/WebKitWebsiteData.cpp (modified) (2 diffs)
• UIProcess/API/glib/WebKitWebsiteDataManager.cpp (modified) (1 diff)
• WebProcess/Network/WebLoaderStrategy.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-13  Pablo Saavedra  <psaavedra@igalia.com>
+
+        [GTK][WPE] Build fails when -DENABLE_SERVICE_WORKER=OFF
+        https://bugs.webkit.org/show_bug.cgi?id=216455
+
+        Unreviewed build fix.
+
+        * UIProcess/API/glib/WebKitWebsiteData.cpp:
+        (recordContainsSupportedDataTypes):
+        (toWebKitWebsiteDataTypes):
+        * UIProcess/API/glib/WebKitWebsiteDataManager.cpp:
+        (toWebsiteDataTypes):
+        * WebProcess/Network/WebLoaderStrategy.cpp:
+        (WebKit::WebLoaderStrategy::scheduleLoad):
+
 2020-09-11  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp

@@ -78 +78 @@
         WebsiteDataType::DeviceIdHashSalt,
         WebsiteDataType::ResourceLoadStatistics,
+#if ENABLE(SERVICE_WORKER)
         WebsiteDataType::ServiceWorkerRegistrations,
+#endif
         WebsiteDataType::DOMCache
     });
@@ -108 +110 @@
     if (types.contains(WebsiteDataType::ResourceLoadStatistics))
         returnValue |= WEBKIT_WEBSITE_DATA_ITP;
+#if ENABLE(SERVICE_WORKER)
     if (types.contains(WebsiteDataType::ServiceWorkerRegistrations))
         returnValue |= WEBKIT_WEBSITE_DATA_SERVICE_WORKER_REGISTRATIONS;
+#endif
     if (types.contains(WebsiteDataType::DOMCache))
         returnValue |= WEBKIT_WEBSITE_DATA_DOM_CACHE;

trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp

@@ -935 +935 @@
     if (types & WEBKIT_WEBSITE_DATA_ITP)
         returnValue.add(WebsiteDataType::ResourceLoadStatistics);
+#if ENABLE(SERVICE_WORKER)
     if (types & WEBKIT_WEBSITE_DATA_SERVICE_WORKER_REGISTRATIONS)
         returnValue.add(WebsiteDataType::ServiceWorkerRegistrations);
+#endif
     if (types & WEBKIT_WEBSITE_DATA_DOM_CACHE)
         returnValue.add(WebsiteDataType::DOMCache);

trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp

@@ -229 +229 @@
         WEBLOADERSTRATEGY_RELEASE_LOG_IF_ALLOWED("scheduleLoad: URL will be scheduled with the NetworkProcess");
 
+#if ENABLE(SERVICE_WORKER)
         if (!resourceLoader.options().serviceWorkerRegistrationIdentifier && InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader.frame(), resourceLoader.request())) {
             InspectorInstrumentationWebKit::interceptRequest(resourceLoader, [this, protectedResourceLoader = makeRefPtr(&resourceLoader), trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, resource](const ResourceRequest& request) {
@@ -235 +236 @@
             return;
         }
+#endif
         scheduleLoadFromNetworkProcess(resourceLoader, resourceLoader.request(), trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime(resource));
         return;