Changeset 267122 in webkit
- Timestamp:
- Sep 15, 2020 5:54:33 PM (4 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r267110 r267122 1 2020-09-15 Alex Christensen <achristensen@webkit.org> 2 3 Move service worker testing timeout setting from WebProcessPool to WebsiteDataStore 4 https://bugs.webkit.org/show_bug.cgi?id=216578 5 6 Reviewed by Geoffrey Garen. 7 8 This is needed for https://bugs.webkit.org/show_bug.cgi?id=216041 9 10 * UIProcess/API/C/WKContext.cpp: 11 (WKContextSetServiceWorkerFetchTimeoutForTesting): Deleted. 12 (WKContextResetServiceWorkerFetchTimeoutForTesting): Deleted. 13 * UIProcess/API/C/WKContext.h: 14 * UIProcess/API/C/WKWebsiteDataStoreRef.cpp: 15 (WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting): 16 (WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting): 17 * UIProcess/API/C/WKWebsiteDataStoreRef.h: 18 * UIProcess/WebProcessPool.cpp: 19 (WebKit::WebProcessPool::setServiceWorkerTimeoutForTesting): Deleted. 20 (WebKit::WebProcessPool::resetServiceWorkerTimeoutForTesting): Deleted. 21 * UIProcess/WebProcessPool.h: 22 * UIProcess/WebsiteData/WebsiteDataStore.cpp: 23 (WebKit::WebsiteDataStore::setServiceWorkerTimeoutForTesting): 24 (WebKit::WebsiteDataStore::resetServiceWorkerTimeoutForTesting): 25 * UIProcess/WebsiteData/WebsiteDataStore.h: 26 1 27 2020-09-15 Peng Liu <peng.liu6@apple.com> 2 28 -
trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp
r267091 r267122 404 404 } 405 405 406 void WKContextSetServiceWorkerFetchTimeoutForTesting(WKContextRef contextRef, double seconds)407 {408 WebKit::toImpl(contextRef)->setServiceWorkerTimeoutForTesting((Seconds)seconds);409 }410 411 void WKContextResetServiceWorkerFetchTimeoutForTesting(WKContextRef contextRef)412 {413 WebKit::toImpl(contextRef)->resetServiceWorkerTimeoutForTesting();414 }415 416 406 void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef, bool) 417 407 { -
trunk/Source/WebKit/UIProcess/API/C/WKContext.h
r267090 r267122 194 194 WK_EXPORT void WKContextSetCustomWebContentServiceBundleIdentifier(WKContextRef contextRef, WKStringRef name); 195 195 196 WK_EXPORT void WKContextSetServiceWorkerFetchTimeoutForTesting(WKContextRef contextRef, double seconds);197 WK_EXPORT void WKContextResetServiceWorkerFetchTimeoutForTesting(WKContextRef contextRef);198 199 196 #ifdef __cplusplus 200 197 } -
trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp
r267091 r267122 98 98 } 99 99 100 void WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore, double seconds) 101 { 102 WebKit::toImpl(dataStore)->setServiceWorkerTimeoutForTesting(Seconds(seconds)); 103 } 104 105 void WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore) 106 { 107 WebKit::toImpl(dataStore)->resetServiceWorkerTimeoutForTesting(); 108 } 109 100 110 void WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKWebsiteDataStoreRef dataStoreRef, bool enable) 101 111 { -
trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h
r267091 r267122 43 43 44 44 WK_EXPORT WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef); 45 46 WK_EXPORT void WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore, double seconds); 47 WK_EXPORT void WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore); 45 48 46 49 WK_EXPORT void WKWebsiteDataStoreSetAllowsAnySSLCertificateForWebSocketTesting(WKWebsiteDataStoreRef dataStore, bool allows); -
trunk/Source/WebKit/UIProcess/WebProcessPool.cpp
r267091 r267122 1537 1537 } 1538 1538 1539 void WebProcessPool::setServiceWorkerTimeoutForTesting(Seconds seconds)1540 {1541 sendSyncToNetworkingProcess(Messages::NetworkProcess::SetServiceWorkerFetchTimeoutForTesting(seconds), Messages::NetworkProcess::SetServiceWorkerFetchTimeoutForTesting::Reply());1542 }1543 1544 void WebProcessPool::resetServiceWorkerTimeoutForTesting()1545 {1546 sendSyncToNetworkingProcess(Messages::NetworkProcess::ResetServiceWorkerFetchTimeoutForTesting(), Messages::NetworkProcess::ResetServiceWorkerFetchTimeoutForTesting::Reply());1547 }1548 1549 1539 void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText) 1550 1540 { -
trunk/Source/WebKit/UIProcess/WebProcessPool.h
r267091 r267122 267 267 void activePagesOriginsInWebProcessForTesting(ProcessID, CompletionHandler<void(Vector<String>&&)>&&); 268 268 bool networkProcessHasEntitlementForTesting(const String&); 269 void setServiceWorkerTimeoutForTesting(Seconds);270 void resetServiceWorkerTimeoutForTesting();271 269 272 270 WebPageGroup& defaultPageGroup() { return m_defaultPageGroup.get(); } -
trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp
r267091 r267122 1179 1179 } 1180 1180 1181 void WebsiteDataStore::setServiceWorkerTimeoutForTesting(Seconds seconds) 1182 { 1183 for (auto& processPool : WebProcessPool::allProcessPools()) { 1184 if (auto* networkProcess = processPool->networkProcess()) 1185 networkProcess->sendSync(Messages::NetworkProcess::SetServiceWorkerFetchTimeoutForTesting(seconds), Messages::NetworkProcess::SetServiceWorkerFetchTimeoutForTesting::Reply(), 0); 1186 } 1187 } 1188 1189 void WebsiteDataStore::resetServiceWorkerTimeoutForTesting() 1190 { 1191 for (auto& processPool : WebProcessPool::allProcessPools()) { 1192 if (auto* networkProcess = processPool->networkProcess()) 1193 networkProcess->sendSync(Messages::NetworkProcess::ResetServiceWorkerFetchTimeoutForTesting(), Messages::NetworkProcess::ResetServiceWorkerFetchTimeoutForTesting::Reply(), 0); 1194 } 1195 } 1196 1181 1197 #if ENABLE(RESOURCE_LOAD_STATISTICS) 1182 1198 void WebsiteDataStore::setMaxStatisticsEntries(size_t maximumEntryCount, CompletionHandler<void()>&& completionHandler) -
trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h
r267091 r267122 142 142 void getLocalStorageDetails(Function<void(Vector<LocalStorageDatabaseTracker::OriginDetails>&&)>&&); 143 143 void setCacheModelSynchronouslyForTesting(CacheModel); 144 void setServiceWorkerTimeoutForTesting(Seconds); 145 void resetServiceWorkerTimeoutForTesting(); 144 146 145 147 #if ENABLE(RESOURCE_LOAD_STATISTICS) -
trunk/Tools/ChangeLog
r267120 r267122 1 2020-09-15 Alex Christensen <achristensen@webkit.org> 2 3 Move service worker testing timeout setting from WebProcessPool to WebsiteDataStore 4 https://bugs.webkit.org/show_bug.cgi?id=216578 5 6 Reviewed by Geoffrey Garen. 7 8 * WebKitTestRunner/TestController.cpp: 9 (WTR::TestController::resetStateToConsistentValues): 10 (WTR::TestController::setServiceWorkerFetchTimeoutForTesting): 11 1 12 2020-09-15 Fujii Hironori <Hironori.Fujii@sony.com> 2 13 -
trunk/Tools/WebKitTestRunner/TestController.cpp
r267091 r267122 1052 1052 WKWebsiteDataStoreClearCachedCredentials(websiteDataStore()); 1053 1053 1054 WK ContextResetServiceWorkerFetchTimeoutForTesting(TestController::singleton().context());1054 WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting(websiteDataStore()); 1055 1055 1056 1056 WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(websiteDataStore(), true); … … 4035 4035 void TestController::setServiceWorkerFetchTimeoutForTesting(double seconds) 4036 4036 { 4037 WK ContextSetServiceWorkerFetchTimeoutForTesting(platformContext(), seconds);4037 WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting(websiteDataStore(), seconds); 4038 4038 } 4039 4039
Note: See TracChangeset
for help on using the changeset viewer.