Title: [176514] trunk
- Revision
- 176514
- Author
- [email protected]
- Date
- 2014-11-24 03:30:55 -0800 (Mon, 24 Nov 2014)
Log Message
[EFL] Utilize Eail library to support accessibility in EFL
https://bugs.webkit.org/show_bug.cgi?id=137742
Reviewed by Gyuyoung Kim.
Source/WebKit2:
Initialize EAIL module so that all the listeners and atk-bridge started properly.
Dynamic loading of EAIL help us to avoid elementary dependencies in WebKit.
* WebProcess/efl/WebProcessMainEfl.cpp:
(eailLibraryPath): reads path provided by ACCESSIBILITY_EAIL_LIBRARY_PATH variable.
(eail):
Tools:
Eail, atk-bridge, at-spi2 are not mandatory modules for webkit-efl. They are rather optional.
* efl/jhbuild-optional.modules: Added.
* efl/jhbuild.modules:
Modified Paths
Added Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (176513 => 176514)
--- trunk/Source/WebKit2/ChangeLog 2014-11-24 11:18:55 UTC (rev 176513)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-24 11:30:55 UTC (rev 176514)
@@ -1,3 +1,17 @@
+2014-11-24 Krzysztof Czech <[email protected]>
+
+ [EFL] Utilize Eail library to support accessibility in EFL
+ https://bugs.webkit.org/show_bug.cgi?id=137742
+
+ Reviewed by Gyuyoung Kim.
+
+ Initialize EAIL module so that all the listeners and atk-bridge started properly.
+ Dynamic loading of EAIL help us to avoid elementary dependencies in WebKit.
+
+ * WebProcess/efl/WebProcessMainEfl.cpp:
+ (eailLibraryPath): reads path provided by ACCESSIBILITY_EAIL_LIBRARY_PATH variable.
+ (eail):
+
2014-11-24 Carlos Garcia Campos <[email protected]>
[GTK] WebKitWebView is created with the wrong web context when using webkit_web_view_new_with_related_view()
Modified: trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (176513 => 176514)
--- trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2014-11-24 11:18:55 UTC (rev 176513)
+++ trunk/Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp 2014-11-24 11:30:55 UTC (rev 176514)
@@ -35,6 +35,28 @@
#include <WebCore/SoupNetworkSession.h>
#include <libsoup/soup.h>
+#if HAVE(ACCESSIBILITY)
+#include "Module.h"
+/*
+ * This should be defined and filled in elementary but to avoid undefined reference it's defined here.
+ * Setting this variable to nullptr will not cause any trouble to webkit and eail as well.
+ */
+Eina_List* _elm_win_list = nullptr;
+
+typedef int (*EailFunction)(void*);
+
+static char* eailLibraryPath()
+{
+ return getenv("ACCESSIBILITY_EAIL_LIBRARY_PATH");
+}
+
+static WebKit::Module& eail()
+{
+ static NeverDestroyed<WebKit::Module> eail(eailLibraryPath());
+ return eail;
+}
+#endif
+
#ifdef HAVE_ECORE_X
#include <Ecore_X.h>
#include <X11/Xlib.h>
@@ -98,6 +120,14 @@
if (!ecore_main_loop_glib_integrate())
return false;
+#if HAVE(ACCESSIBILITY)
+ // Initialize EAIL module (adding listeners, init atk-bridge)
+ if (eail().load()) {
+ if (EailFunction eailInit = eail().functionPointer<EailFunction>("elm_modapi_init"))
+ eailInit(nullptr);
+ }
+#endif
+
SoupNetworkSession::defaultSession().setupHTTPProxyFromEnvironment();
return true;
}
@@ -116,6 +146,11 @@
#endif
ecore_shutdown();
eina_shutdown();
+
+#if HAVE(ACCESSIBILITY)
+ if (EailFunction eailShutdown = eail().functionPointer<EailFunction>("elm_modapi_shutdown"))
+ eailShutdown(nullptr);
+#endif
}
};
Modified: trunk/Tools/ChangeLog (176513 => 176514)
--- trunk/Tools/ChangeLog 2014-11-24 11:18:55 UTC (rev 176513)
+++ trunk/Tools/ChangeLog 2014-11-24 11:30:55 UTC (rev 176514)
@@ -1,3 +1,15 @@
+2014-11-24 Krzysztof Czech <[email protected]>
+
+ [EFL] Utilize Eail library to support accessibility in EFL
+ https://bugs.webkit.org/show_bug.cgi?id=137742
+
+ Reviewed by Gyuyoung Kim.
+
+ Eail, atk-bridge, at-spi2 are not mandatory modules for webkit-efl. They are rather optional.
+
+ * efl/jhbuild-optional.modules: Added.
+ * efl/jhbuild.modules:
+
2014-11-24 Carlos Garcia Campos <[email protected]>
[GTK] WebKitWebView is created with the wrong web context when using webkit_web_view_new_with_related_view()
Added: trunk/Tools/efl/jhbuild-optional.modules (0 => 176514)
--- trunk/Tools/efl/jhbuild-optional.modules (rev 0)
+++ trunk/Tools/efl/jhbuild-optional.modules 2014-11-24 11:30:55 UTC (rev 176514)
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE moduleset SYSTEM "moduleset.dtd">
+<?xml-stylesheet type="text/xsl" href=""
+<moduleset>
+
+ <repository type="tarball" name="ftp.gnome.org"
+ href=""
+ <repository type="git" name="github"
+ href=""
+
+ <autotools id="at-spi2-core"
+ autogenargs="--disable-introspection">
+ <branch module="pub/GNOME/sources/at-spi2-core/2.10/at-spi2-core-2.10.0.tar.xz" version="2.10.0"
+ repo="ftp.gnome.org"
+ hash="sha256:964155c7574220a00e11e1c0d91f2d3017ed603920eb1333ff9cbdb6a22744db">
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="at-spi2-atk">
+ <branch module="pub/GNOME/sources/at-spi2-atk/2.10/at-spi2-atk-2.10.0.tar.xz" version="2.10.0"
+ repo="ftp.gnome.org"
+ hash="sha256:dea7ff2f9bc9bbdb0351112616d738de718b55739cd2511afecac51604c31a94">
+ </branch>
+ <dependencies>
+ <dep package="glib"/>
+ <dep package="atk"/>
+ <dep package="at-spi2-core"/>
+ </dependencies>
+ </autotools>
+
+ <autotools id="eail" autogen-sh="autogen.sh">
+ <branch repo="github" module="eail.git" checkoutdir="eail-1.0.0"/>
+</autotools>
+
+</moduleset>
Modified: trunk/Tools/efl/jhbuild.modules (176513 => 176514)
--- trunk/Tools/efl/jhbuild.modules 2014-11-24 11:18:55 UTC (rev 176513)
+++ trunk/Tools/efl/jhbuild.modules 2014-11-24 11:30:55 UTC (rev 176514)
@@ -26,6 +26,8 @@
</dependencies>
</metamodule>
+ <include href=""
+
<repository type="tarball" name="github.com"
href=""
<repository type="tarball" name="sourceware.org"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
