Title: [169935] trunk/Source/WebCore
- Revision
- 169935
- Author
- be...@igalia.com
- Date
- 2014-06-13 06:33:38 -0700 (Fri, 13 Jun 2014)
Log Message
[GTK] GLContextEGL.cpp: conflicting declaration 'typedef ptrdiff_t GLintptr'
https://bugs.webkit.org/show_bug.cgi?id=133550
Reviewed by Gustavo Noronha Silva.
Cairo includes some definitions from GLX that conflict with the
ones provided by our GLES2 headers (GLintptr, GLsizeiptr).
Since GLContextEGL doesn't use any GLX functions we can safely
disable the inclusion of those functions in that source file.
* platform/graphics/egl/GLContextEGL.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169934 => 169935)
--- trunk/Source/WebCore/ChangeLog 2014-06-13 13:09:58 UTC (rev 169934)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 13:33:38 UTC (rev 169935)
@@ -1,3 +1,18 @@
+2014-06-13 Alberto Garcia <be...@igalia.com>
+
+ [GTK] GLContextEGL.cpp: conflicting declaration 'typedef ptrdiff_t GLintptr'
+ https://bugs.webkit.org/show_bug.cgi?id=133550
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Cairo includes some definitions from GLX that conflict with the
+ ones provided by our GLES2 headers (GLintptr, GLsizeiptr).
+
+ Since GLContextEGL doesn't use any GLX functions we can safely
+ disable the inclusion of those functions in that source file.
+
+ * platform/graphics/egl/GLContextEGL.cpp:
+
2014-06-13 Manuel Rego Casasnovas <r...@igalia.com>
[CSS Grid Layout] Introduce an explicit type for resolved grid positions
Modified: trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp (169934 => 169935)
--- trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2014-06-13 13:09:58 UTC (rev 169934)
+++ trunk/Source/WebCore/platform/graphics/egl/GLContextEGL.cpp 2014-06-13 13:33:38 UTC (rev 169935)
@@ -36,6 +36,10 @@
#endif
#if ENABLE(ACCELERATED_2D_CANVAS)
+// cairo-gl.h includes some definitions from GLX that conflict with
+// the ones provided by us. Since GLContextEGL doesn't use any GLX
+// functions we can safely disable them.
+#undef CAIRO_HAS_GLX_FUNCTIONS
#include <cairo-gl.h>
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
