<!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>[176538] trunk</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/176538">176538</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-25 01:59:38 -0800 (Tue, 25 Nov 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[EFL] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/176514">r176514</a>): It made performance tests fail
https://bugs.webkit.org/show_bug.cgi?id=139037

Reviewed by Gyuyoung Kim.

Source/WebKit2:

* WebProcess/efl/WebProcessMainEfl.cpp: Don't try to load/shutdown eail if eailLibraryPath() is empty.

Tools:

* Scripts/webkitpy/port/efl.py:
(EflPort.setup_environ_for_server): Pass ACCESSIBILITY_EAIL_LIBRARY_PATH environment variable to WTR.
* efl/jhbuildrc: Set ACCESSIBILITY_EAIL_LIBRARY_PATH to point to DependenciesEFL/lib/libeail.so
only if ACCESSIBILITY_EAIL_LIBRARY_PATH isn't already set and DependenciesEFL/lib/libeail.so exists.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcesseflWebProcessMainEflcpp">trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyporteflpy">trunk/Tools/Scripts/webkitpy/port/efl.py</a></li>
<li><a href="#trunkToolsefljhbuildrc">trunk/Tools/efl/jhbuildrc</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176537 => 176538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-11-25 07:41:27 UTC (rev 176537)
+++ trunk/Source/WebKit2/ChangeLog        2014-11-25 09:59:38 UTC (rev 176538)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-11-25  Csaba Osztrogonác  &lt;ossy@webkit.org&gt;
+
+        [EFL] REGRESSION(r176514): It made performance tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=139037
+
+        Reviewed by Gyuyoung Kim.
+
+        * WebProcess/efl/WebProcessMainEfl.cpp: Don't try to load/shutdown eail if eailLibraryPath() is empty.
+
</ins><span class="cx"> 2014-11-24  Eva Balazsfalvi  &lt;evab.u-szeged@partner.samsung.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove Qt cruft related to tap higlighting
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesseflWebProcessMainEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (176537 => 176538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp        2014-11-25 07:41:27 UTC (rev 176537)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp        2014-11-25 09:59:38 UTC (rev 176538)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><span class="cx">         // Initialize EAIL module (adding listeners, init atk-bridge)
</span><del>-        if (eail().load()) {
</del><ins>+        if (eailLibraryPath() &amp;&amp; eail().load()) {
</ins><span class="cx">             if (EailFunction eailInit = eail().functionPointer&lt;EailFunction&gt;(&quot;elm_modapi_init&quot;))
</span><span class="cx">                 eailInit(nullptr);
</span><span class="cx">         }
</span><span class="lines">@@ -148,8 +148,10 @@
</span><span class="cx">         eina_shutdown();
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(ACCESSIBILITY)
</span><del>-        if (EailFunction eailShutdown = eail().functionPointer&lt;EailFunction&gt;(&quot;elm_modapi_shutdown&quot;))
-            eailShutdown(nullptr);
</del><ins>+        if (eailLibraryPath()) {
+            if (EailFunction eailShutdown = eail().functionPointer&lt;EailFunction&gt;(&quot;elm_modapi_shutdown&quot;))
+                eailShutdown(nullptr);
+        }
</ins><span class="cx"> #endif
</span><span class="cx">     }
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (176537 => 176538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-11-25 07:41:27 UTC (rev 176537)
+++ trunk/Tools/ChangeLog        2014-11-25 09:59:38 UTC (rev 176538)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-11-25  Csaba Osztrogonác  &lt;ossy@webkit.org&gt;
+
+        [EFL] REGRESSION(r176514): It made performance tests fail
+        https://bugs.webkit.org/show_bug.cgi?id=139037
+
+        Reviewed by Gyuyoung Kim.
+
+        * Scripts/webkitpy/port/efl.py:
+        (EflPort.setup_environ_for_server): Pass ACCESSIBILITY_EAIL_LIBRARY_PATH environment variable to WTR.
+        * efl/jhbuildrc: Set ACCESSIBILITY_EAIL_LIBRARY_PATH to point to DependenciesEFL/lib/libeail.so
+        only if ACCESSIBILITY_EAIL_LIBRARY_PATH isn't already set and DependenciesEFL/lib/libeail.so exists.
+
</ins><span class="cx"> 2014-11-24  Michael Catanzaro  &lt;mcatanzaro@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] update-webkitgtk-libs fails to build fontconfig
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (176537 => 176538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl.py        2014-11-25 07:41:27 UTC (rev 176537)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py        2014-11-25 09:59:38 UTC (rev 176538)
</span><span class="lines">@@ -64,6 +64,9 @@
</span><span class="cx">         if not 'DISPLAY' in os.environ:
</span><span class="cx">             del env['DISPLAY']
</span><span class="cx"> 
</span><ins>+        if 'ACCESSIBILITY_EAIL_LIBRARY_PATH' in os.environ:
+            env['ACCESSIBILITY_EAIL_LIBRARY_PATH'] = os.environ['ACCESSIBILITY_EAIL_LIBRARY_PATH']
+
</ins><span class="cx">         env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
</span><span class="cx">         env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsefljhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuildrc (176537 => 176538)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuildrc        2014-11-25 07:41:27 UTC (rev 176537)
+++ trunk/Tools/efl/jhbuildrc        2014-11-25 09:59:38 UTC (rev 176538)
</span><span class="lines">@@ -33,4 +33,9 @@
</span><span class="cx"> addpath('XDG_DATA_DIRS', '/usr/share')
</span><span class="cx"> addpath('XDG_CONFIG_DIRS', '/etc/xdg')
</span><span class="cx"> 
</span><ins>+if not 'ACCESSIBILITY_EAIL_LIBRARY_PATH' in os.environ:
+    _libeail_path = os.path.join(os.environ['CMAKE_LIBRARY_PATH'], 'libeail.so')
+    if os.path.isfile(_libeail_path):
+        os.environ['ACCESSIBILITY_EAIL_LIBRARY_PATH'] = _libeail_path
+
</ins><span class="cx"> partial_build = False
</span></span></pre>
</div>
</div>

</body>
</html>