Title: [152888] releases/WebKitGTK/webkit-2.0/Source/WebCore
- Revision
- 152888
- Author
- [email protected]
- Date
- 2013-07-19 01:36:41 -0700 (Fri, 19 Jul 2013)
Log Message
Merge r152552 - Fix build against GTK+ 2.0
https://bugs.webkit.org/show_bug.cgi?id=117895
Patch by Dominique Leuenberger <[email protected]> on 2013-07-10
Reviewed by Martin Robinson.
GTK2 build fails for undefined GDK_IS_X11_DISPLAY
GTK 2.0 does define GDK_WINDOWING_X11,but GDK_IS_X11_DISPLAY is not
present in GTK+ 2.0. A dummy defines is sufficient, as GTK 2.0 is not
that multiple backend aware anyway...
* platform/gtk/GtkVersioning.h: Define GDK_IS_X11_DISPLAY for GTK+ 2.0
and compatibility for gtk_widget_get_preferred_size()
* plugins/gtk/gtk2xtbin.c: Include config.h
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog (152887 => 152888)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-07-19 08:22:01 UTC (rev 152887)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/ChangeLog 2013-07-19 08:36:41 UTC (rev 152888)
@@ -1,3 +1,19 @@
+2013-07-10 Dominique Leuenberger <[email protected]>
+
+ Fix build against GTK+ 2.0
+ https://bugs.webkit.org/show_bug.cgi?id=117895
+
+ Reviewed by Martin Robinson.
+
+ GTK2 build fails for undefined GDK_IS_X11_DISPLAY
+ GTK 2.0 does define GDK_WINDOWING_X11,but GDK_IS_X11_DISPLAY is not
+ present in GTK+ 2.0. A dummy defines is sufficient, as GTK 2.0 is not
+ that multiple backend aware anyway...
+
+ * platform/gtk/GtkVersioning.h: Define GDK_IS_X11_DISPLAY for GTK+ 2.0
+ and compatibility for gtk_widget_get_preferred_size()
+ * plugins/gtk/gtk2xtbin.c: Include config.h
+
2013-07-15 Brian Holt <[email protected]>
[ATK] Leak: Leak in WebKitAccessibleTextGetText
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/GtkVersioning.h (152887 => 152888)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/GtkVersioning.h 2013-07-19 08:22:01 UTC (rev 152887)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/platform/gtk/GtkVersioning.h 2013-07-19 08:36:41 UTC (rev 152888)
@@ -122,6 +122,21 @@
void gdk_screen_get_monitor_workarea(GdkScreen *, int monitor, GdkRectangle *area);
#endif
+// gtk_widget_get_preferred_size() appeared only in GTK 3.0.
+#if !GTK_CHECK_VERSION (2, 91, 0) // gtk_widget_get_preferred_size appeared about then.
+#define gtk_widget_get_preferred_size(widget, minimumSize, naturalSize) \
+ (gtk_widget_size_request((widget), ((minimumSize))))
+#endif
+
+// Define GDK_IS_X11_DISPLAY dummy for GTK+ 2.0 compatibility.
+#ifdef GTK_API_VERSION_2
+ #ifdef GDK_WINDOWING_X11
+ #define GDK_IS_X11_DISPLAY(display) 1
+ #else
+ #define GDK_IS_X11_DISPLAY(display) 0
+ #endif
+#endif
+
G_END_DECLS
#endif // GtkVersioning_h
Modified: releases/WebKitGTK/webkit-2.0/Source/WebCore/plugins/gtk/gtk2xtbin.c (152887 => 152888)
--- releases/WebKitGTK/webkit-2.0/Source/WebCore/plugins/gtk/gtk2xtbin.c 2013-07-19 08:22:01 UTC (rev 152887)
+++ releases/WebKitGTK/webkit-2.0/Source/WebCore/plugins/gtk/gtk2xtbin.c 2013-07-19 08:36:41 UTC (rev 152888)
@@ -42,6 +42,7 @@
* inside a GTK application.
*/
+#include "config.h"
#include "GtkVersioning.h"
#include "xembed.h"
#include "gtk2xtbin.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes