Title: [185456] trunk
- Revision
- 185456
- Author
- [email protected]
- Date
- 2015-06-11 09:00:40 -0700 (Thu, 11 Jun 2015)
Log Message
Unreviewed, rolling out r185453.
https://bugs.webkit.org/show_bug.cgi?id=145881
it broke the 32-bit build (Requested by clopez on #webkit).
Reverted changeset:
"[GTK] [Wayland] Should be possible to build with support for
both X11 and Wayland."
https://bugs.webkit.org/show_bug.cgi?id=145701
http://trac.webkit.org/changeset/185453
Modified Paths
Diff
Modified: trunk/ChangeLog (185455 => 185456)
--- trunk/ChangeLog 2015-06-11 15:42:02 UTC (rev 185455)
+++ trunk/ChangeLog 2015-06-11 16:00:40 UTC (rev 185456)
@@ -1,3 +1,17 @@
+2015-06-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r185453.
+ https://bugs.webkit.org/show_bug.cgi?id=145881
+
+ it broke the 32-bit build (Requested by clopez on #webkit).
+
+ Reverted changeset:
+
+ "[GTK] [Wayland] Should be possible to build with support for
+ both X11 and Wayland."
+ https://bugs.webkit.org/show_bug.cgi?id=145701
+ http://trac.webkit.org/changeset/185453
+
2015-06-11 Carlos Alberto Lopez Perez <[email protected]>
[GTK] [Wayland] Should be possible to build with support for both X11 and Wayland.
Modified: trunk/Source/WebCore/ChangeLog (185455 => 185456)
--- trunk/Source/WebCore/ChangeLog 2015-06-11 15:42:02 UTC (rev 185455)
+++ trunk/Source/WebCore/ChangeLog 2015-06-11 16:00:40 UTC (rev 185456)
@@ -1,3 +1,17 @@
+2015-06-11 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r185453.
+ https://bugs.webkit.org/show_bug.cgi?id=145881
+
+ it broke the 32-bit build (Requested by clopez on #webkit).
+
+ Reverted changeset:
+
+ "[GTK] [Wayland] Should be possible to build with support for
+ both X11 and Wayland."
+ https://bugs.webkit.org/show_bug.cgi?id=145701
+ http://trac.webkit.org/changeset/185453
+
2015-06-11 Carlos Alberto Lopez Perez <[email protected]>
[GTK] [Wayland] Should be possible to build with support for both X11 and Wayland.
Modified: trunk/Source/WebCore/platform/graphics/GLContext.cpp (185455 => 185456)
--- trunk/Source/WebCore/platform/graphics/GLContext.cpp 2015-06-11 15:42:02 UTC (rev 185455)
+++ trunk/Source/WebCore/platform/graphics/GLContext.cpp 2015-06-11 16:00:40 UTC (rev 185456)
@@ -123,7 +123,7 @@
#endif
#if USE(GLX)
- if (auto glxContext = GLContextGLX::createContext(reinterpret_cast<XID>(windowHandle), sharingContext))
+ if (auto glxContext = GLContextGLX::createContext(windowHandle, sharingContext))
return WTF::move(glxContext);
#endif
#if USE(EGL)
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (185455 => 185456)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2015-06-11 15:42:02 UTC (rev 185455)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2015-06-11 16:00:40 UTC (rev 185456)
@@ -37,7 +37,6 @@
#if PLATFORM(X11)
#include "PlatformDisplayX11.h"
-#include <X11/Xlib.h>
#endif
#if ENABLE(ACCELERATED_2D_CANVAS)
@@ -172,7 +171,7 @@
return nullptr;
}
- EGLSurface surface = eglCreatePixmapSurface(display, config, reinterpret_cast<EGLNativePixmapType>(pixmap.get()), 0);
+ EGLSurface surface = eglCreatePixmapSurface(display, config, pixmap.get(), 0);
if (surface == EGL_NO_SURFACE) {
eglDestroyContext(display, context);
return nullptr;
Modified: trunk/Source/cmake/OptionsGTK.cmake (185455 => 185456)
--- trunk/Source/cmake/OptionsGTK.cmake 2015-06-11 15:42:02 UTC (rev 185455)
+++ trunk/Source/cmake/OptionsGTK.cmake 2015-06-11 16:00:40 UTC (rev 185456)
@@ -80,6 +80,9 @@
# FIXME: Can we use cairo-glesv2 to avoid this conflict?
WEBKIT_OPTION_CONFLICT(ENABLE_ACCELERATED_2D_CANVAS ENABLE_GLES2)
+# FIXME: Should be possible to build with support for both X11 and Wayland.
+WEBKIT_OPTION_CONFLICT(ENABLE_WAYLAND_TARGET ENABLE_X11_TARGET)
+
WEBKIT_OPTION_DEPEND(ENABLE_3D_TRANSFORMS ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_ACCELERATED_2D_CANVAS ENABLE_OPENGL)
WEBKIT_OPTION_DEPEND(ENABLE_GLES2 ENABLE_OPENGL)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
