Changeset 176514 in webkit

Timestamp:

Nov 24, 2014, 3:30:55 AM (12 years ago)

Author:

k.czech@samsung.com

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:

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/WebProcess/efl/WebProcessMainEfl.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/efl/jhbuild-optional.modules (added)
• Tools/efl/jhbuild.modules (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-11-24  Krzysztof Czech  <k.czech@samsung.com>
+
+        [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  <cgarcia@igalia.com>
 

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

@@ -35 +35 @@
 #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
@@ -99 +121 @@
             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;
@@ -117 +147 @@
         ecore_shutdown();
         eina_shutdown();
+
+#if HAVE(ACCESSIBILITY)
+        if (EailFunction eailShutdown = eail().functionPointer<EailFunction>("elm_modapi_shutdown"))
+            eailShutdown(nullptr);
+#endif
     }
 };

trunk/Tools/ChangeLog

@@ +1 @@
+2014-11-24  Krzysztof Czech  <k.czech@samsung.com>
+
+        [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  <cgarcia@igalia.com>
 

trunk/Tools/efl/jhbuild.modules

@@ -26 +26 @@
     </dependencies>
   </metamodule>
+
+  <include href="jhbuild-optional.modules"/>
 
   <repository type="tarball" name="github.com"