Title: [160997] trunk/Source/WebCore
- Revision
- 160997
- Author
- [email protected]
- Date
- 2013-12-23 08:28:48 -0800 (Mon, 23 Dec 2013)
Log Message
webkit gtk 2.2.3 stable tarball compilation error
https://bugs.webkit.org/show_bug.cgi?id=125987
Reviewed by Gustavo Noronha Silva.
Only try including <gdk/gdkwayland.h> and using GDK_IS_WAYLAND_DISPLAY if the Wayland support has been
enabled and when not compiling with GTK+ 2 (which occurs when building for libPlatformGtk2).
* platform/graphics/GLContext.cpp:
(WebCore::GLContext::createContextForWindow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (160996 => 160997)
--- trunk/Source/WebCore/ChangeLog 2013-12-23 15:55:02 UTC (rev 160996)
+++ trunk/Source/WebCore/ChangeLog 2013-12-23 16:28:48 UTC (rev 160997)
@@ -1,3 +1,16 @@
+2013-12-23 Zan Dobersek <[email protected]>
+
+ webkit gtk 2.2.3 stable tarball compilation error
+ https://bugs.webkit.org/show_bug.cgi?id=125987
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Only try including <gdk/gdkwayland.h> and using GDK_IS_WAYLAND_DISPLAY if the Wayland support has been
+ enabled and when not compiling with GTK+ 2 (which occurs when building for libPlatformGtk2).
+
+ * platform/graphics/GLContext.cpp:
+ (WebCore::GLContext::createContextForWindow):
+
2013-12-23 Piotr Grad <[email protected]>
[GStreamer] video/audio seeking is not unified.
Modified: trunk/Source/WebCore/platform/graphics/GLContext.cpp (160996 => 160997)
--- trunk/Source/WebCore/platform/graphics/GLContext.cpp 2013-12-23 15:55:02 UTC (rev 160996)
+++ trunk/Source/WebCore/platform/graphics/GLContext.cpp 2013-12-23 16:28:48 UTC (rev 160997)
@@ -37,12 +37,10 @@
#if PLATFORM(GTK)
#include <gdk/gdk.h>
-#ifndef GTK_API_VERSION_2
-#ifdef GDK_WINDOWING_WAYLAND
+#if PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2) && defined(GDK_WINDOWING_WAYLAND)
#include <gdk/gdkwayland.h>
#endif
#endif
-#endif
using WTF::ThreadSpecific;
@@ -146,7 +144,7 @@
PassOwnPtr<GLContext> GLContext::createContextForWindow(GLNativeWindowType windowHandle, GLContext* sharingContext)
{
-#if PLATFORM(GTK) && defined(GDK_WINDOWING_WAYLAND) && USE(EGL)
+#if PLATFORM(GTK) && PLATFORM(WAYLAND) && !defined(GTK_API_VERSION_2) && defined(GDK_WINDOWING_WAYLAND) && USE(EGL)
GdkDisplay* display = gdk_display_manager_get_default_display(gdk_display_manager_get());
if (GDK_IS_WAYLAND_DISPLAY(display)) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
