Changeset 188948 in webkit

Timestamp:

Aug 26, 2015 12:03:24 AM (9 years ago)

Author:

Gyuyoung Kim

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• WebKitTestRunner/efl/TestControllerEfl.cpp (modified) (1 diff)
• WebKitTestRunner/gtk/TestControllerGtk.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2015-08-26  Gyuyoung Kim  <gyuyoung.kim@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_wang@apple.com>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -1601 +1601 @@
 }
 
+#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&)
@@ -1606 +1614 @@
 }
 
-WKPreferencesRef TestController::platformPreferences()
-{
-    WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageCopyPageConfiguration(m_mainWebView->page())); 
-    return WKPageConfigurationGetPreferences(configuration.get());
-}
-
 void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
 {

trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp

@@ -59 +59 @@
         m_forceNoTimeout = true;
     }
+}
+
+WKPreferencesRef TestController::platformPreferences()
+{
+    return WKPageGroupGetPreferences(m_pageGroup.get());
 }
 

trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp

@@ -47 +47 @@
 void TestController::platformInitialize()
 {
+}
+
+WKPreferencesRef TestController::platformPreferences()
+{
+    return WKPageGroupGetPreferences(m_pageGroup.get());
 }