Title: [230702] trunk/Source/WebCore
- Revision
- 230702
- Author
- commit-qu...@webkit.org
- Date
- 2018-04-16 23:54:26 -0700 (Mon, 16 Apr 2018)
Log Message
Inconsistent EGL defines in ImageBufferCairo
https://bugs.webkit.org/show_bug.cgi?id=184661
Patch by Pablo Saavedra <psaave...@igalia.com> on 2018-04-16
Reviewed by Žan Doberšek.
On revision r219391 libepoxy is added. The headers in
ImageBufferCairo.cpp become inconsistent when 2D canvas is enabled
(-DENABLE_ACCELERATED_2D_CANVAS=ON) due to a redefinition error during
the Webkit build:
...
/usr/include/GLES2/gl2.h:503:82: error: 'voi
epoxy_glAttachShader(GLuint, GLuint)' redeclared as different kind
of symbol
GL_APICALL void GL_APIENTRY glAttachShader (GLuint
program, GLuint shader);
No new tests.
* platform/graphics/cairo/ImageBufferCairo.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (230701 => 230702)
--- trunk/Source/WebCore/ChangeLog 2018-04-17 05:48:41 UTC (rev 230701)
+++ trunk/Source/WebCore/ChangeLog 2018-04-17 06:54:26 UTC (rev 230702)
@@ -1,3 +1,26 @@
+2018-04-16 Pablo Saavedra <psaave...@igalia.com>
+
+ Inconsistent EGL defines in ImageBufferCairo
+ https://bugs.webkit.org/show_bug.cgi?id=184661
+
+ Reviewed by Žan Doberšek.
+
+ On revision r219391 libepoxy is added. The headers in
+ ImageBufferCairo.cpp become inconsistent when 2D canvas is enabled
+ (-DENABLE_ACCELERATED_2D_CANVAS=ON) due to a redefinition error during
+ the Webkit build:
+
+ ...
+ /usr/include/GLES2/gl2.h:503:82: error: 'voi
+ epoxy_glAttachShader(GLuint, GLuint)' redeclared as different kind
+ of symbol
+ GL_APICALL void GL_APIENTRY glAttachShader (GLuint
+ program, GLuint shader);
+
+ No new tests.
+
+ * platform/graphics/cairo/ImageBufferCairo.cpp:
+
2018-04-16 Filip Pizlo <fpi...@apple.com>
MutationObserver should be in an IsoHeap
Modified: trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp (230701 => 230702)
--- trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2018-04-17 05:48:41 UTC (rev 230701)
+++ trunk/Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp 2018-04-17 06:54:26 UTC (rev 230702)
@@ -52,12 +52,18 @@
#include "GLContext.h"
#include "TextureMapperGL.h"
-#if USE(EGL) && USE(LIBEPOXY)
+#if USE(EGL)
+#if USE(LIBEPOXY)
#include "EpoxyEGL.h"
+#else
+#include <EGL/egl.h>
#endif
+#endif
#include <cairo-gl.h>
-#if USE(OPENGL_ES)
+#if USE(LIBEPOXY)
+#include <epoxy/gl.h>
+#elif USE(OPENGL_ES)
#include <GLES2/gl2.h>
#else
#include "OpenGLShims.h"
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
