[EFL] REGRESSION(r176514): 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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@176538 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 2883fdb..0525396 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-25  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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.
+
 2014-11-24  Eva Balazsfalvi  <evab.u-szeged@partner.samsung.com>
 
         Remove Qt cruft related to tap higlighting

diff --git a/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp b/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
index 1b07138..3af6dc9 100644 (file)
--- a/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
+++ b/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp
@@ -122,7 +122,7 @@ public:
 
 #if HAVE(ACCESSIBILITY)
         // Initialize EAIL module (adding listeners, init atk-bridge)
-        if (eail().load()) {
+        if (eailLibraryPath() && eail().load()) {
             if (EailFunction eailInit = eail().functionPointer<EailFunction>("elm_modapi_init"))
                 eailInit(nullptr);
         }
@@ -148,8 +148,10 @@ public:
         eina_shutdown();
 
 #if HAVE(ACCESSIBILITY)
-        if (EailFunction eailShutdown = eail().functionPointer<EailFunction>("elm_modapi_shutdown"))
-            eailShutdown(nullptr);
+        if (eailLibraryPath()) {
+            if (EailFunction eailShutdown = eail().functionPointer<EailFunction>("elm_modapi_shutdown"))
+                eailShutdown(nullptr);
+        }
 #endif
     }
 };

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 510426e..adefb63 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2014-11-25  Csaba Osztrogonác  <ossy@webkit.org>
+
+        [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.
+
 2014-11-24  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         [GTK] update-webkitgtk-libs fails to build fontconfig

diff --git a/Tools/Scripts/webkitpy/port/efl.py b/Tools/Scripts/webkitpy/port/efl.py
index c453d32..66d9f3e 100644 (file)
--- a/Tools/Scripts/webkitpy/port/efl.py
+++ b/Tools/Scripts/webkitpy/port/efl.py
@@ -64,6 +64,9 @@ class EflPort(Port):
         if not 'DISPLAY' in os.environ:
             del env['DISPLAY']
 
+        if 'ACCESSIBILITY_EAIL_LIBRARY_PATH' in os.environ:
+            env['ACCESSIBILITY_EAIL_LIBRARY_PATH'] = os.environ['ACCESSIBILITY_EAIL_LIBRARY_PATH']
+
         env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
         env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
 

diff --git a/Tools/efl/jhbuildrc b/Tools/efl/jhbuildrc
index d1daeae..41b2646 100644 (file)
--- a/Tools/efl/jhbuildrc
+++ b/Tools/efl/jhbuildrc
@@ -33,4 +33,9 @@ jhbuildrc_common.init(globals(), "efl")
 addpath('XDG_DATA_DIRS', '/usr/share')
 addpath('XDG_CONFIG_DIRS', '/etc/xdg')
 
+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
+
 partial_build = False