Title: [152552] trunk/Source/WebCore
- Revision
- 152552
- Author
- [email protected]
- Date
- 2013-07-10 15:39:03 -0700 (Wed, 10 Jul 2013)
Log Message
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: trunk/Source/WebCore/ChangeLog (152551 => 152552)
--- trunk/Source/WebCore/ChangeLog 2013-07-10 21:40:52 UTC (rev 152551)
+++ trunk/Source/WebCore/ChangeLog 2013-07-10 22:39:03 UTC (rev 152552)
@@ -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-10 Tim Horton <[email protected]>
Deferring layer flushes can cause painting without layout being done
Modified: trunk/Source/WebCore/platform/gtk/GtkVersioning.h (152551 => 152552)
--- trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2013-07-10 21:40:52 UTC (rev 152551)
+++ trunk/Source/WebCore/platform/gtk/GtkVersioning.h 2013-07-10 22:39:03 UTC (rev 152552)
@@ -40,6 +40,21 @@
GdkDevice* getDefaultGDKPointerDevice(GdkWindow* window);
+// 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.
+#ifndef GDK_IS_X11_DISPLAY
+ #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: trunk/Source/WebCore/plugins/gtk/gtk2xtbin.c (152551 => 152552)
--- trunk/Source/WebCore/plugins/gtk/gtk2xtbin.c 2013-07-10 21:40:52 UTC (rev 152551)
+++ trunk/Source/WebCore/plugins/gtk/gtk2xtbin.c 2013-07-10 22:39:03 UTC (rev 152552)
@@ -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
