Changeset 176538 in webkit

Timestamp:

Nov 25, 2014, 1:59:38 AM (12 years ago)

Author:

Csaba Osztrogonác

Message:

[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.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/port/efl.py (modified) (1 diff)
• Tools/efl/jhbuildrc (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp

@@ -123 +123 @@
 #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);
@@ -149 +149 @@
 
 #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
     }

trunk/Tools/ChangeLog

@@ +1 @@
+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>
 

trunk/Tools/Scripts/webkitpy/port/efl.py

@@ -64 +64 @@
         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')

trunk/Tools/efl/jhbuildrc

@@ -34 +34 @@
 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