Title: [188948] trunk/Tools
- Revision
- 188948
- Author
- gyuyoung....@webkit.org
- Date
- 2015-08-26 00:03:24 -0700 (Wed, 26 Aug 2015)
Log Message
[EFL][GTK] REGRESSION(r188828): All performance tests and almost all layout tests crash
https://bugs.webkit.org/show_bug.cgi?id=148377
Reviewed by Carlos Garcia Campos.
EFL and GTK don't support TestController::platformPreferences() yet which was introduced by r188828.
It caused all crashes of layout test and performance test on EFL and GTK. So this patch implements
TestController::platformPreferences() using WKPageGroupGetPreferences() which was previous thing for
EFL and GTK at the moment.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::platformWillRunTest):
* WebKitTestRunner/efl/TestControllerEfl.cpp:
(WTR::TestController::platformPreferences):
* WebKitTestRunner/gtk/TestControllerGtk.cpp:
(WTR::TestController::platformPreferences):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (188947 => 188948)
--- trunk/Tools/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/ChangeLog 2015-08-26 07:03:24 UTC (rev 188948)
@@ -1,3 +1,22 @@
+2015-08-26 Gyuyoung Kim <gyuyoung....@webkit.org>
+
+ [EFL][GTK] REGRESSION(r188828): All performance tests and almost all layout tests crash
+ https://bugs.webkit.org/show_bug.cgi?id=148377
+
+ Reviewed by Carlos Garcia Campos.
+
+ EFL and GTK don't support TestController::platformPreferences() yet which was introduced by r188828.
+ It caused all crashes of layout test and performance test on EFL and GTK. So this patch implements
+ TestController::platformPreferences() using WKPageGroupGetPreferences() which was previous thing for
+ EFL and GTK at the moment.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::platformWillRunTest):
+ * WebKitTestRunner/efl/TestControllerEfl.cpp:
+ (WTR::TestController::platformPreferences):
+ * WebKitTestRunner/gtk/TestControllerGtk.cpp:
+ (WTR::TestController::platformPreferences):
+
2015-08-25 Nan Wang <n_w...@apple.com>
AX: Enable accessibility/aria-controls.html test for mac
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (188947 => 188948)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2015-08-26 07:03:24 UTC (rev 188948)
@@ -1600,17 +1600,19 @@
m_currentInvocation->outputText(String::format("WebView updated the title for history URL \"%s\" to \"%s\".\n", toSTD(urlStringWK).c_str(), toSTD(title).c_str()));
}
-#if !PLATFORM(COCOA)
-void TestController::platformWillRunTest(const TestInvocation&)
-{
-}
-
+#if !PLATFORM(EFL) && !PLATFORM(GTK) && !PLATFORM(COCOA)
WKPreferencesRef TestController::platformPreferences()
{
WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageCopyPageConfiguration(m_mainWebView->page()));
return WKPageConfigurationGetPreferences(configuration.get());
}
+#endif
+#if !PLATFORM(COCOA)
+void TestController::platformWillRunTest(const TestInvocation&)
+{
+}
+
void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
{
m_mainWebView = std::make_unique<PlatformWebView>(configuration, options);
Modified: trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp (188947 => 188948)
--- trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp 2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp 2015-08-26 07:03:24 UTC (rev 188948)
@@ -60,6 +60,11 @@
}
}
+WKPreferencesRef TestController::platformPreferences()
+{
+ return WKPageGroupGetPreferences(m_pageGroup.get());
+}
+
void TestController::platformDestroy()
{
}
Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (188947 => 188948)
--- trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp 2015-08-26 07:03:24 UTC (rev 188948)
@@ -48,6 +48,11 @@
{
}
+WKPreferencesRef TestController::platformPreferences()
+{
+ return WKPageGroupGetPreferences(m_pageGroup.get());
+}
+
void TestController::platformDestroy()
{
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
