Title: [261779] trunk/Tools
- Revision
- 261779
- Author
- [email protected]
- Date
- 2020-05-15 22:45:49 -0700 (Fri, 15 May 2020)
Log Message
[GTK][WPE] Add default initialization of WebsiteDataStore to WebKitTestRunner after r261758
https://bugs.webkit.org/show_bug.cgi?id=211977
As GTK/WPE does not explicitly create WebSiteDataStore for the tests,
assign the default one.
Not sure if this is the correct fix, but should allow running tests
again.
Reviewed by Žan Doberšek.
* WebKitTestRunner/TestController.cpp: Add GTK/WPE guards.
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
(WTR::TestController::platformInitializeDataStore): Use default
WebsiteDataStore.
* WebKitTestRunner/wpe/TestControllerWPE.cpp:
(WTR::TestController::platformInitializeDataStore): Use default
websiteDataStore.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (261778 => 261779)
--- trunk/Tools/ChangeLog 2020-05-16 04:32:20 UTC (rev 261778)
+++ trunk/Tools/ChangeLog 2020-05-16 05:45:49 UTC (rev 261779)
@@ -1,3 +1,24 @@
+2020-05-15 Lauro Moura <[email protected]>
+
+ [GTK][WPE] Add default initialization of WebsiteDataStore to WebKitTestRunner after r261758
+ https://bugs.webkit.org/show_bug.cgi?id=211977
+
+ As GTK/WPE does not explicitly create WebSiteDataStore for the tests,
+ assign the default one.
+
+ Not sure if this is the correct fix, but should allow running tests
+ again.
+
+ Reviewed by Žan Doberšek.
+
+ * WebKitTestRunner/TestController.cpp: Add GTK/WPE guards.
+ * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+ (WTR::TestController::platformInitializeDataStore): Use default
+ WebsiteDataStore.
+ * WebKitTestRunner/wpe/TestControllerWPE.cpp:
+ (WTR::TestController::platformInitializeDataStore): Use default
+ websiteDataStore.
+
2020-05-15 Alex Christensen <[email protected]>
Use enum serialization instead of casting to/from uint32_t
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (261778 => 261779)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2020-05-16 04:32:20 UTC (rev 261778)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2020-05-16 05:45:49 UTC (rev 261779)
@@ -3116,10 +3116,12 @@
{
}
+#if !PLATFORM(GTK) && !PLATFORM(WPE)
void TestController::platformInitializeDataStore(WKPageConfigurationRef configuration, const TestOptions&)
{
m_websiteDataStore = WKPageConfigurationGetWebsiteDataStore(configuration);
}
+#endif
void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const TestOptions& options)
{
Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (261778 => 261779)
--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2020-05-16 04:32:20 UTC (rev 261778)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2020-05-16 05:45:49 UTC (rev 261779)
@@ -46,6 +46,11 @@
{
}
+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 (261778 => 261779)
--- trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp 2020-05-16 04:32:20 UTC (rev 261778)
+++ trunk/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp 2020-05-16 05:45:49 UTC (rev 261779)
@@ -45,6 +45,11 @@
{
}
+void TestController::platformInitializeDataStore(WKPageConfigurationRef, const TestOptions& options)
+{
+ m_websiteDataStore = defaultWebsiteDataStore();
+}
+
WKPreferencesRef TestController::platformPreferences()
{
return WKPageGroupGetPreferences(m_pageGroup.get());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
