Title: [225690] trunk
- Revision
- 225690
- Author
- cdu...@apple.com
- Date
- 2017-12-08 11:36:32 -0800 (Fri, 08 Dec 2017)
Log Message
Different WebKitTestRunner instances should use different service worker registrations databases
https://bugs.webkit.org/show_bug.cgi?id=180589
Reviewed by Brady Eidson.
Source/WebKit:
* UIProcess/API/C/WKContextConfigurationRef.cpp:
(WKContextConfigurationCopyServiceWorkerDatabaseDirectory):
(WKContextConfigurationSetServiceWorkerDatabaseDirectory):
* UIProcess/API/C/WKContextConfigurationRef.h:
Tools:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::generateContextConfiguration const):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (225689 => 225690)
--- trunk/Source/WebKit/ChangeLog 2017-12-08 19:34:30 UTC (rev 225689)
+++ trunk/Source/WebKit/ChangeLog 2017-12-08 19:36:32 UTC (rev 225690)
@@ -1,3 +1,15 @@
+2017-12-08 Chris Dumez <cdu...@apple.com>
+
+ Different WebKitTestRunner instances should use different service worker registrations databases
+ https://bugs.webkit.org/show_bug.cgi?id=180589
+
+ Reviewed by Brady Eidson.
+
+ * UIProcess/API/C/WKContextConfigurationRef.cpp:
+ (WKContextConfigurationCopyServiceWorkerDatabaseDirectory):
+ (WKContextConfigurationSetServiceWorkerDatabaseDirectory):
+ * UIProcess/API/C/WKContextConfigurationRef.h:
+
2017-12-08 Alex Christensen <achristen...@webkit.org>
Pass std::optional<WebsitePolicies> instead of WebsitePolicies
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp (225689 => 225690)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp 2017-12-08 19:34:30 UTC (rev 225689)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp 2017-12-08 19:36:32 UTC (rev 225690)
@@ -78,6 +78,16 @@
toImpl(configuration)->setIndexedDBDatabaseDirectory(toImpl(indexedDBDatabaseDirectory)->string());
}
+WKStringRef WKContextConfigurationCopyServiceWorkerDatabaseDirectory(WKContextConfigurationRef configuration)
+{
+ return toCopiedAPI(toImpl(configuration)->serviceWorkerRegistrationDirectory());
+}
+
+void WKContextConfigurationSetServiceWorkerDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef swDatabaseDirectory)
+{
+ toImpl(configuration)->setServiceWorkerRegistrationDirectory(toImpl(swDatabaseDirectory)->string());
+}
+
WKStringRef WKContextConfigurationCopyInjectedBundlePath(WKContextConfigurationRef configuration)
{
return toCopiedAPI(toImpl(configuration)->injectedBundlePath());
Modified: trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h (225689 => 225690)
--- trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h 2017-12-08 19:34:30 UTC (rev 225689)
+++ trunk/Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h 2017-12-08 19:36:32 UTC (rev 225690)
@@ -44,6 +44,9 @@
WK_EXPORT WKStringRef WKContextConfigurationCopyIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration);
WK_EXPORT void WKContextConfigurationSetIndexedDBDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef indexedDBDatabaseDirectory);
+WK_EXPORT WKStringRef WKContextConfigurationCopyServiceWorkerDatabaseDirectory(WKContextConfigurationRef configuration);
+WK_EXPORT void WKContextConfigurationSetServiceWorkerDatabaseDirectory(WKContextConfigurationRef configuration, WKStringRef swDatabaseDirectory);
+
WK_EXPORT WKStringRef WKContextConfigurationCopyInjectedBundlePath(WKContextConfigurationRef configuration);
WK_EXPORT void WKContextConfigurationSetInjectedBundlePath(WKContextConfigurationRef configuration, WKStringRef injectedBundlePath);
Modified: trunk/Tools/ChangeLog (225689 => 225690)
--- trunk/Tools/ChangeLog 2017-12-08 19:34:30 UTC (rev 225689)
+++ trunk/Tools/ChangeLog 2017-12-08 19:36:32 UTC (rev 225690)
@@ -1,3 +1,13 @@
+2017-12-08 Chris Dumez <cdu...@apple.com>
+
+ Different WebKitTestRunner instances should use different service worker registrations databases
+ https://bugs.webkit.org/show_bug.cgi?id=180589
+
+ Reviewed by Brady Eidson.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::generateContextConfiguration const):
+
2017-12-08 Fujii Hironori <hironori.fu...@sony.com>
Tools/ImageDiff/cg/PlatformImageCG.cpp doesn't need to include <wtf/MathExtras.h>
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (225689 => 225690)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2017-12-08 19:34:30 UTC (rev 225689)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2017-12-08 19:36:32 UTC (rev 225690)
@@ -411,6 +411,7 @@
WKContextConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
WKContextConfigurationSetDiskCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "Cache").get());
WKContextConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "IndexedDB").get());
+ WKContextConfigurationSetServiceWorkerDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "ServiceWorkers").get());
WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "WebSQL").get());
WKContextConfigurationSetMediaKeysStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "MediaKeys").get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
