Title: [220644] releases/WebKitGTK/webkit-2.18/Source/WebCore
- Revision
- 220644
- Author
- carlo...@webkit.org
- Date
- 2017-08-13 23:53:49 -0700 (Sun, 13 Aug 2017)
Log Message
Merge r220464 - [WinCairo] Fix build after rev 220399
https://bugs.webkit.org/show_bug.cgi?id=175360
Reviewed by Žan Doberšek.
No new tests. No change in behavior.
* platform/graphics/texmap/TextureMapperGLHeaders.h:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog (220643 => 220644)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-14 06:52:30 UTC (rev 220643)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/ChangeLog 2017-08-14 06:53:49 UTC (rev 220644)
@@ -1,3 +1,14 @@
+2017-08-09 Don Olmstead <don.olmst...@sony.com>
+
+ [WinCairo] Fix build after rev 220399
+ https://bugs.webkit.org/show_bug.cgi?id=175360
+
+ Reviewed by Žan Doberšek.
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/texmap/TextureMapperGLHeaders.h:
+
2017-08-09 Charlie Turner <ctur...@igalia.com>
[GStreamer][MSE] Add missing lock around getStreamByTrackId
Modified: releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h (220643 => 220644)
--- releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h 2017-08-14 06:52:30 UTC (rev 220643)
+++ releases/WebKitGTK/webkit-2.18/Source/WebCore/platform/graphics/texmap/TextureMapperGLHeaders.h 2017-08-14 06:53:49 UTC (rev 220644)
@@ -28,6 +28,7 @@
#if USE(LIBEPOXY)
#include <epoxy/gl.h>
#elif USE(OPENGL_ES_2)
+#define GL_GLEXT_PROTOTYPES 1
#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
