Title: [219503] trunk/Source/WebCore
- Revision
- 219503
- Author
- commit-qu...@webkit.org
- Date
- 2017-07-14 05:06:15 -0700 (Fri, 14 Jul 2017)
Log Message
[WinCairo] Build broken "Cannot open include file: 'GL/glext.h'" since Bug 172104
https://bugs.webkit.org/show_bug.cgi?id=174492
Patch by Fujii Hironori <hironori.fu...@sony.com> on 2017-07-14
Reviewed by Žan Doberšek.
WinCairo port uses GLES. OpenGLShims.h shouldn't be included.
* platform/graphics/cairo/GraphicsContext3DCairo.cpp:
Include "OpenGLShims.h" only if !USE(OPENGL_ES_2) instead of USE(OPENGL).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (219502 => 219503)
--- trunk/Source/WebCore/ChangeLog 2017-07-14 08:21:52 UTC (rev 219502)
+++ trunk/Source/WebCore/ChangeLog 2017-07-14 12:06:15 UTC (rev 219503)
@@ -1,3 +1,15 @@
+2017-07-14 Fujii Hironori <hironori.fu...@sony.com>
+
+ [WinCairo] Build broken "Cannot open include file: 'GL/glext.h'" since Bug 172104
+ https://bugs.webkit.org/show_bug.cgi?id=174492
+
+ Reviewed by Žan Doberšek.
+
+ WinCairo port uses GLES. OpenGLShims.h shouldn't be included.
+
+ * platform/graphics/cairo/GraphicsContext3DCairo.cpp:
+ Include "OpenGLShims.h" only if !USE(OPENGL_ES_2) instead of USE(OPENGL).
+
2017-07-14 Chris Dumez <cdu...@apple.com>
PageCache::removeAllItemsForPage(Page&) may reenter itself and cause crashes
Modified: trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp (219502 => 219503)
--- trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2017-07-14 08:21:52 UTC (rev 219502)
+++ trunk/Source/WebCore/platform/graphics/cairo/GraphicsContext3DCairo.cpp 2017-07-14 12:06:15 UTC (rev 219503)
@@ -49,7 +49,7 @@
#if USE(LIBEPOXY)
#include <epoxy/gl.h>
-#elif USE(OPENGL)
+#elif !USE(OPENGL_ES_2)
#include "OpenGLShims.h"
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
