Title: [153947] trunk/Source
- Revision
- 153947
- Author
- [email protected]
- Date
- 2013-08-12 10:16:19 -0700 (Mon, 12 Aug 2013)
Log Message
[GTK] Don't load GAIL when using GTK 3.2 or greater
https://bugs.webkit.org/show_bug.cgi?id=72735
Patch by Anton Obzhirov <[email protected]> on 2013-08-12
Reviewed by Carlos Garcia Campos.
Source/WebKit/gtk:
* tests/testatk.c:
(initializeTestingFramework):
(main):
Source/WebKit2:
* UIProcess/API/gtk/tests/AccessibilityTestServer.cpp:
(main):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (153946 => 153947)
--- trunk/Source/WebKit/gtk/ChangeLog 2013-08-12 16:52:48 UTC (rev 153946)
+++ trunk/Source/WebKit/gtk/ChangeLog 2013-08-12 17:16:19 UTC (rev 153947)
@@ -1,3 +1,14 @@
+2013-08-12 Anton Obzhirov <[email protected]>
+
+ [GTK] Don't load GAIL when using GTK 3.2 or greater
+ https://bugs.webkit.org/show_bug.cgi?id=72735
+
+ Reviewed by Carlos Garcia Campos.
+
+ * tests/testatk.c:
+ (initializeTestingFramework):
+ (main):
+
2013-08-11 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.1.4 release.
Modified: trunk/Source/WebKit/gtk/tests/testatk.c (153946 => 153947)
--- trunk/Source/WebKit/gtk/tests/testatk.c 2013-08-12 16:52:48 UTC (rev 153946)
+++ trunk/Source/WebKit/gtk/tests/testatk.c 2013-08-12 17:16:19 UTC (rev 153947)
@@ -2154,8 +2154,7 @@
g_object_unref(parentContainer);
}
-/* FIXME: Please remove this function and replace its usage by
- gtk_test_init() when upgrading to GTK 3.2 or greater. */
+#ifdef GTK_API_VERSION_2
static void initializeTestingFramework(int argc, char** argv)
{
/* Ensure GAIL is the only module loaded. */
@@ -2166,23 +2165,21 @@
gtk_disable_setlocale();
setlocale(LC_ALL, "C");
-#ifndef GTK_API_VERSION_2
- /* gdk_disable_multidevice() available since GTK+ 3.0 only. */
- gdk_disable_multidevice();
-#endif
-
gtk_init(&argc, &argv);
}
+#endif
int main(int argc, char** argv)
{
- /* We can't just call to gtk_test_init() in this case because its
- implementation makes sure that no GTK+ module will be loaded, and
- we will need to load GAIL for tests that need to use AtkObjects
- from non-WebKit GtkWidgets (e.g parentForRootObject). However, it
- shouldn't be needed to do this in the future, as GAIL won't longer
- be a separate module (but part of GTK+) since GTK+ 3.2 on. */
+#ifdef GTK_API_VERSION_2
+ /* We can't just call to gtk_test_init() in this case because its
+ implementation makes sure that no GTK+ module will be loaded, and
+ we will need to load GAIL for tests that need to use AtkObjects
+ from non-WebKit GtkWidgets (e.g parentForRootObject).*/
initializeTestingFramework(argc, argv);
+#else
+ gtk_test_init(&argc, &argv, NULL);
+#endif
g_test_bug_base("https://bugs.webkit.org/");
g_test_add_func("/webkit/atk/caretOffsets", testWebkitAtkCaretOffsets);
Modified: trunk/Source/WebKit2/ChangeLog (153946 => 153947)
--- trunk/Source/WebKit2/ChangeLog 2013-08-12 16:52:48 UTC (rev 153946)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-12 17:16:19 UTC (rev 153947)
@@ -1,3 +1,13 @@
+2013-08-12 Anton Obzhirov <[email protected]>
+
+ [GTK] Don't load GAIL when using GTK 3.2 or greater
+ https://bugs.webkit.org/show_bug.cgi?id=72735
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/tests/AccessibilityTestServer.cpp:
+ (main):
+
2013-08-09 Beth Dakin <[email protected]>
AX: Not able to use arrow keys to read text in a WK2 app
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp (153946 => 153947)
--- trunk/Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp 2013-08-12 16:52:48 UTC (rev 153946)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/tests/AccessibilityTestServer.cpp 2013-08-12 17:16:19 UTC (rev 153947)
@@ -31,8 +31,8 @@
int main(int argc, char** argv)
{
- // Make sure that both GAIL and the ATK bridge are loaded.
- g_setenv("GTK_MODULES", "gail:atk-bridge", TRUE);
+ // Make sure that the ATK bridge is loaded.
+ g_setenv("GTK_MODULES", "atk-bridge", TRUE);
gtk_init(&argc, &argv);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes