Title: [261846] trunk/Tools
- Revision
- 261846
- Author
- chris.r...@sony.com
- Date
- 2020-05-18 19:41:11 -0700 (Mon, 18 May 2020)
Log Message
[WinCairo] WKTR WebsiteDataStore is being overwritten by the default one
https://bugs.webkit.org/show_bug.cgi?id=212044
Reviewed by Fujii Hironori.
Ensure TestController::defaultWebSiteDataStore is being used for WinCairo as done in r259705.
Also consolidate platformInitializeDataStore implementations with GTK/WPE since WinCairo WKTR
also started crashing since r261758.
* WebKitTestRunner/TestController.cpp:
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
* WebKitTestRunner/wpe/TestControllerWPE.cpp:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (261845 => 261846)
--- trunk/Tools/ChangeLog 2020-05-19 02:32:50 UTC (rev 261845)
+++ trunk/Tools/ChangeLog 2020-05-19 02:41:11 UTC (rev 261846)
@@ -1,3 +1,19 @@
+2020-05-18 Christopher Reid <chris.r...@sony.com>
+
+ [WinCairo] WKTR WebsiteDataStore is being overwritten by the default one
+ https://bugs.webkit.org/show_bug.cgi?id=212044
+
+ Reviewed by Fujii Hironori.
+
+ Ensure TestController::defaultWebSiteDataStore is being used for WinCairo as done in r259705.
+
+ Also consolidate platformInitializeDataStore implementations with GTK/WPE since WinCairo WKTR
+ also started crashing since r261758.
+
+ * WebKitTestRunner/TestController.cpp:
+ * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+ * WebKitTestRunner/wpe/TestControllerWPE.cpp:
+
2020-05-18 Andy Estes <aes...@apple.com>
http/tests/ssl/applepay/ApplePayInstallmentConfiguration.https.html fails in public SDK builds
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (261845 => 261846)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2020-05-19 02:32:50 UTC (rev 261845)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2020-05-19 02:41:11 UTC (rev 261846)
@@ -3116,12 +3116,10 @@
{
}
-#if !PLATFORM(GTK) && !PLATFORM(WPE)
-void TestController::platformInitializeDataStore(WKPageConfigurationRef configuration, const TestOptions&)
+void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions&)
{
- m_websiteDataStore = WKPageConfigurationGetWebsiteDataStore(configuration);
+ m_websiteDataStore = defaultWebsiteDataStore();
}
-#endif
void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const TestOptions& options)
{
@@ -3135,12 +3133,8 @@
WKContextRef TestController::platformAdjustContext(WKContextRef context, WKContextConfigurationRef contextConfiguration)
{
-#if PLATFORM(GTK) || PLATFORM(WPE)
WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(defaultWebsiteDataStore(), true);
WKContextSetPrimaryWebsiteDataStore(context, defaultWebsiteDataStore());
-#else
- WKWebsiteDataStoreSetResourceLoadStatisticsEnabled(WKContextGetWebsiteDataStore(context), true);
-#endif
return context;
}
@@ -3201,7 +3195,7 @@
WKPageClearLoadedThirdPartyDomains(m_mainWebView->page());
}
-#endif
+#endif // !PLATFORM(COCOA)
struct ClearServiceWorkerRegistrationsCallbackContext {
explicit ClearServiceWorkerRegistrationsCallbackContext(TestController& controller)
Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (261845 => 261846)
--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2020-05-19 02:32:50 UTC (rev 261845)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2020-05-19 02:41:11 UTC (rev 261846)
@@ -46,11 +46,6 @@
{
}
-void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions& options)
-{
- m_websiteDataStore = defaultWebsiteDataStore();
-}
-
WKPreferencesRef TestController::platformPreferences()
{
return WKPageGroupGetPreferences(m_pageGroup.get());
Modified: trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp (261845 => 261846)
--- trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp 2020-05-19 02:32:50 UTC (rev 261845)
+++ trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp 2020-05-19 02:41:11 UTC (rev 261846)
@@ -45,11 +45,6 @@
{
}
-void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions& options)
-{
- m_websiteDataStore = defaultWebsiteDataStore();
-}
-
WKPreferencesRef TestController::platformPreferences()
{
return WKPageGroupGetPreferences(m_pageGroup.get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
