Changeset 266990 in webkit
- Timestamp:
- Sep 13, 2020 1:13:14 AM (4 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r266951 r266990 1 2020-09-13 Pablo Saavedra <psaavedra@igalia.com> 2 3 [GTK][WPE] Build fails when -DENABLE_SERVICE_WORKER=OFF 4 https://bugs.webkit.org/show_bug.cgi?id=216455 5 6 Unreviewed build fix. 7 8 * UIProcess/API/glib/WebKitWebsiteData.cpp: 9 (recordContainsSupportedDataTypes): 10 (toWebKitWebsiteDataTypes): 11 * UIProcess/API/glib/WebKitWebsiteDataManager.cpp: 12 (toWebsiteDataTypes): 13 * WebProcess/Network/WebLoaderStrategy.cpp: 14 (WebKit::WebLoaderStrategy::scheduleLoad): 15 1 16 2020-09-11 Alex Christensen <achristensen@webkit.org> 2 17 -
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteData.cpp
r265753 r266990 78 78 WebsiteDataType::DeviceIdHashSalt, 79 79 WebsiteDataType::ResourceLoadStatistics, 80 #if ENABLE(SERVICE_WORKER) 80 81 WebsiteDataType::ServiceWorkerRegistrations, 82 #endif 81 83 WebsiteDataType::DOMCache 82 84 }); … … 108 110 if (types.contains(WebsiteDataType::ResourceLoadStatistics)) 109 111 returnValue |= WEBKIT_WEBSITE_DATA_ITP; 112 #if ENABLE(SERVICE_WORKER) 110 113 if (types.contains(WebsiteDataType::ServiceWorkerRegistrations)) 111 114 returnValue |= WEBKIT_WEBSITE_DATA_SERVICE_WORKER_REGISTRATIONS; 115 #endif 112 116 if (types.contains(WebsiteDataType::DOMCache)) 113 117 returnValue |= WEBKIT_WEBSITE_DATA_DOM_CACHE; -
trunk/Source/WebKit/UIProcess/API/glib/WebKitWebsiteDataManager.cpp
r266718 r266990 935 935 if (types & WEBKIT_WEBSITE_DATA_ITP) 936 936 returnValue.add(WebsiteDataType::ResourceLoadStatistics); 937 #if ENABLE(SERVICE_WORKER) 937 938 if (types & WEBKIT_WEBSITE_DATA_SERVICE_WORKER_REGISTRATIONS) 938 939 returnValue.add(WebsiteDataType::ServiceWorkerRegistrations); 940 #endif 939 941 if (types & WEBKIT_WEBSITE_DATA_DOM_CACHE) 940 942 returnValue.add(WebsiteDataType::DOMCache); -
trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp
r266829 r266990 229 229 WEBLOADERSTRATEGY_RELEASE_LOG_IF_ALLOWED("scheduleLoad: URL will be scheduled with the NetworkProcess"); 230 230 231 #if ENABLE(SERVICE_WORKER) 231 232 if (!resourceLoader.options().serviceWorkerRegistrationIdentifier && InspectorInstrumentationWebKit::shouldInterceptRequest(resourceLoader.frame(), resourceLoader.request())) { 232 233 InspectorInstrumentationWebKit::interceptRequest(resourceLoader, [this, protectedResourceLoader = makeRefPtr(&resourceLoader), trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, resource](const ResourceRequest& request) { … … 235 236 return; 236 237 } 238 #endif 237 239 scheduleLoadFromNetworkProcess(resourceLoader, resourceLoader.request(), trackingParameters, shouldClearReferrerOnHTTPSToHTTPRedirect, maximumBufferingTime(resource)); 238 240 return;
Note: See TracChangeset
for help on using the changeset viewer.