Title: [156324] releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk
- Revision
- 156324
- Author
- zandober...@gmail.com
- Date
- 2013-09-24 03:36:46 -0700 (Tue, 24 Sep 2013)
Log Message
Merge r156261 - Unreviewed, GTK build fix when building with GTK+ 2.0.
Patch provided by Dominique Leuenberger <dims...@opensuse.org>.
* WebCoreSupport/AcceleratedCompositingContextGL.cpp: Include GtkVersioning.h to set up
the mock GDK_IS_X11_DISPLAY macro if it's not provided by the GTK+ headers.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/ChangeLog (156323 => 156324)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/ChangeLog 2013-09-24 10:25:14 UTC (rev 156323)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/ChangeLog 2013-09-24 10:36:46 UTC (rev 156324)
@@ -1,3 +1,11 @@
+2013-09-22 Zan Dobersek <zdober...@igalia.com>
+
+ Unreviewed, GTK build fix when building with GTK+ 2.0.
+ Patch provided by Dominique Leuenberger <dims...@opensuse.org>.
+
+ * WebCoreSupport/AcceleratedCompositingContextGL.cpp: Include GtkVersioning.h to set up
+ the mock GDK_IS_X11_DISPLAY macro if it's not provided by the GTK+ headers.
+
2013-09-18 Carlos Garcia Campos <cgar...@igalia.com>
Unreviewed. Update NEWS and Versions.m4 for 2.1.92 release.
Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp (156323 => 156324)
--- releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-09-24 10:25:14 UTC (rev 156323)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit/gtk/WebCoreSupport/AcceleratedCompositingContextGL.cpp 2013-09-24 10:36:46 UTC (rev 156324)
@@ -25,6 +25,7 @@
#include "Frame.h"
#include "FrameView.h"
#include "GraphicsLayerTextureMapper.h"
+#include "GtkVersioning.h"
#include "PlatformContextCairo.h"
#include "Settings.h"
#include "TextureMapperGL.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
