Changeset 267122 in webkit


Ignore:
Timestamp:
Sep 15, 2020 5:54:33 PM (4 years ago)
Author:
commit-queue@webkit.org
Message:

Move service worker testing timeout setting from WebProcessPool to WebsiteDataStore
https://bugs.webkit.org/show_bug.cgi?id=216578

Patch by Alex Christensen <achristensen@webkit.org> on 2020-09-15
Reviewed by Geoffrey Garen.

Source/WebKit:

This is needed for https://bugs.webkit.org/show_bug.cgi?id=216041

  • UIProcess/API/C/WKContext.cpp:

(WKContextSetServiceWorkerFetchTimeoutForTesting): Deleted.
(WKContextResetServiceWorkerFetchTimeoutForTesting): Deleted.

  • UIProcess/API/C/WKContext.h:
  • UIProcess/API/C/WKWebsiteDataStoreRef.cpp:

(WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting):
(WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting):

  • UIProcess/API/C/WKWebsiteDataStoreRef.h:
  • UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::setServiceWorkerTimeoutForTesting): Deleted.
(WebKit::WebProcessPool::resetServiceWorkerTimeoutForTesting): Deleted.

  • UIProcess/WebProcessPool.h:
  • UIProcess/WebsiteData/WebsiteDataStore.cpp:

(WebKit::WebsiteDataStore::setServiceWorkerTimeoutForTesting):
(WebKit::WebsiteDataStore::resetServiceWorkerTimeoutForTesting):

  • UIProcess/WebsiteData/WebsiteDataStore.h:

Tools:

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::resetStateToConsistentValues):
(WTR::TestController::setServiceWorkerFetchTimeoutForTesting):

Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/ChangeLog

    r267110 r267122  
     12020-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
    1272020-09-15  Peng Liu  <peng.liu6@apple.com>
    228
  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r267091 r267122  
    404404}
    405405
    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 
    416406void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef, bool)
    417407{
  • trunk/Source/WebKit/UIProcess/API/C/WKContext.h

    r267090 r267122  
    194194WK_EXPORT void WKContextSetCustomWebContentServiceBundleIdentifier(WKContextRef contextRef, WKStringRef name);
    195195
    196 WK_EXPORT void WKContextSetServiceWorkerFetchTimeoutForTesting(WKContextRef contextRef, double seconds);
    197 WK_EXPORT void WKContextResetServiceWorkerFetchTimeoutForTesting(WKContextRef contextRef);
    198 
    199196#ifdef __cplusplus
    200197}
  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

    r267091 r267122  
    9898}
    9999
     100void WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore, double seconds)
     101{
     102    WebKit::toImpl(dataStore)->setServiceWorkerTimeoutForTesting(Seconds(seconds));
     103}
     104
     105void WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore)
     106{
     107    WebKit::toImpl(dataStore)->resetServiceWorkerTimeoutForTesting();
     108}
     109
    100110void WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKWebsiteDataStoreRef dataStoreRef, bool enable)
    101111{
  • trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h

    r267091 r267122  
    4343
    4444WK_EXPORT WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef);
     45
     46WK_EXPORT void WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore, double seconds);
     47WK_EXPORT void WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting(WKWebsiteDataStoreRef dataStore);
    4548
    4649WK_EXPORT void WKWebsiteDataStoreSetAllowsAnySSLCertificateForWebSocketTesting(WKWebsiteDataStoreRef dataStore, bool allows);
  • trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r267091 r267122  
    15371537}
    15381538
    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 
    15491539void WebProcessPool::setAlwaysUsesComplexTextCodePath(bool alwaysUseComplexText)
    15501540{
  • trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r267091 r267122  
    267267    void activePagesOriginsInWebProcessForTesting(ProcessID, CompletionHandler<void(Vector<String>&&)>&&);
    268268    bool networkProcessHasEntitlementForTesting(const String&);
    269     void setServiceWorkerTimeoutForTesting(Seconds);
    270     void resetServiceWorkerTimeoutForTesting();
    271269
    272270    WebPageGroup& defaultPageGroup() { return m_defaultPageGroup.get(); }
  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.cpp

    r267091 r267122  
    11791179}
    11801180
     1181void 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
     1189void 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
    11811197#if ENABLE(RESOURCE_LOAD_STATISTICS)
    11821198void WebsiteDataStore::setMaxStatisticsEntries(size_t maximumEntryCount, CompletionHandler<void()>&& completionHandler)
  • trunk/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h

    r267091 r267122  
    142142    void getLocalStorageDetails(Function<void(Vector<LocalStorageDatabaseTracker::OriginDetails>&&)>&&);
    143143    void setCacheModelSynchronouslyForTesting(CacheModel);
     144    void setServiceWorkerTimeoutForTesting(Seconds);
     145    void resetServiceWorkerTimeoutForTesting();
    144146
    145147#if ENABLE(RESOURCE_LOAD_STATISTICS)
  • trunk/Tools/ChangeLog

    r267120 r267122  
     12020-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
    1122020-09-15  Fujii Hironori  <Hironori.Fujii@sony.com>
    213
  • trunk/Tools/WebKitTestRunner/TestController.cpp

    r267091 r267122  
    10521052    WKWebsiteDataStoreClearCachedCredentials(websiteDataStore());
    10531053
    1054     WKContextResetServiceWorkerFetchTimeoutForTesting(TestController::singleton().context());
     1054    WKWebsiteDataStoreResetServiceWorkerFetchTimeoutForTesting(websiteDataStore());
    10551055
    10561056    WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(websiteDataStore(), true);
     
    40354035void TestController::setServiceWorkerFetchTimeoutForTesting(double seconds)
    40364036{
    4037     WKContextSetServiceWorkerFetchTimeoutForTesting(platformContext(), seconds);
     4037    WKWebsiteDataStoreSetServiceWorkerFetchTimeoutForTesting(websiteDataStore(), seconds);
    40384038}
    40394039
Note: See TracChangeset for help on using the changeset viewer.