Title: [176538] trunk
- Revision
- 176538
- Author
- [email protected]
- Date
- 2014-11-25 01:59:38 -0800 (Tue, 25 Nov 2014)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176537 => 176538)
--- 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)
@@ -1,3 +1,12 @@
+2014-11-25 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
Remove Qt cruft related to tap higlighting
Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (176537 => 176538)
--- 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)
@@ -122,7 +122,7 @@
#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 @@
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
}
};
Modified: trunk/Tools/ChangeLog (176537 => 176538)
--- trunk/Tools/ChangeLog 2014-11-25 07:41:27 UTC (rev 176537)
+++ trunk/Tools/ChangeLog 2014-11-25 09:59:38 UTC (rev 176538)
@@ -1,3 +1,15 @@
+2014-11-25 Csaba Osztrogonác <[email protected]>
+
+ [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 <[email protected]>
[GTK] update-webkitgtk-libs fails to build fontconfig
Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (176537 => 176538)
--- 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)
@@ -64,6 +64,9 @@
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')
Modified: trunk/Tools/efl/jhbuildrc (176537 => 176538)
--- 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)
@@ -33,4 +33,9 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
