<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188948] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188948">188948</a></dd>
<dt>Author</dt> <dd>gyuyoung.kim@webkit.org</dd>
<dt>Date</dt> <dd>2015-08-26 00:03:24 -0700 (Wed, 26 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][GTK] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/188828">r188828</a>): 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 <a href="http://trac.webkit.org/projects/webkit/changeset/188828">r188828</a>.
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnereflTestControllerEflcpp">trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnergtkTestControllerGtkcpp">trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (188947 => 188948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-26 06:49:45 UTC (rev 188947)
+++ trunk/Tools/ChangeLog 2015-08-26 07:03:24 UTC (rev 188948)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+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):
+
</ins><span class="cx"> 2015-08-25 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: Enable accessibility/aria-controls.html test for mac
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (188947 => 188948)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1600,17 +1600,19 @@
</span><span class="cx"> m_currentInvocation->outputText(String::format("WebView updated the title for history URL \"%s\" to \"%s\".\n", toSTD(urlStringWK).c_str(), toSTD(title).c_str()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if !PLATFORM(COCOA)
-void TestController::platformWillRunTest(const TestInvocation&)
-{
-}
-
</del><ins>+#if !PLATFORM(EFL) && !PLATFORM(GTK) && !PLATFORM(COCOA)
</ins><span class="cx"> WKPreferencesRef TestController::platformPreferences()
</span><span class="cx"> {
</span><span class="cx"> WKRetainPtr<WKPageConfigurationRef> configuration = adoptWK(WKPageCopyPageConfiguration(m_mainWebView->page()));
</span><span class="cx"> return WKPageConfigurationGetPreferences(configuration.get());
</span><span class="cx"> }
</span><ins>+#endif
</ins><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+void TestController::platformWillRunTest(const TestInvocation&)
+{
+}
+
</ins><span class="cx"> void TestController::platformCreateWebView(WKPageConfigurationRef configuration, const ViewOptions& options)
</span><span class="cx"> {
</span><span class="cx"> m_mainWebView = std::make_unique<PlatformWebView>(configuration, options);
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnereflTestControllerEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp (188947 => 188948)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -60,6 +60,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKPreferencesRef TestController::platformPreferences()
+{
+ return WKPageGroupGetPreferences(m_pageGroup.get());
+}
+
</ins><span class="cx"> void TestController::platformDestroy()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnergtkTestControllerGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp (188947 => 188948)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,6 +48,11 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WKPreferencesRef TestController::platformPreferences()
+{
+ return WKPageGroupGetPreferences(m_pageGroup.get());
+}
+
</ins><span class="cx"> void TestController::platformDestroy()
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>