Title: [255423] trunk/Source/WebCore
- Revision
- 255423
- Author
- [email protected]
- Date
- 2020-01-30 06:12:24 -0800 (Thu, 30 Jan 2020)
Log Message
[GStreamer] Fix build with ACCELERATED_2D_CANVAS enabled
https://bugs.webkit.org/show_bug.cgi?id=206976
Reviewed by Philippe Normand.
When ACCELERATED_2D_CANVAS is enabled the MediaPlayerPrivate uses both PlatformDisplay and
GLContext that were undefined. Apart from that all the MediaPlayer::PreLoad::None enums fail
because cairo-gl.h ends up including X.h which already defines None.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (255422 => 255423)
--- trunk/Source/WebCore/ChangeLog 2020-01-30 13:47:58 UTC (rev 255422)
+++ trunk/Source/WebCore/ChangeLog 2020-01-30 14:12:24 UTC (rev 255423)
@@ -1,3 +1,16 @@
+2020-01-29 Sergio Villar Senin <[email protected]>
+
+ [GStreamer] Fix build with ACCELERATED_2D_CANVAS enabled
+ https://bugs.webkit.org/show_bug.cgi?id=206976
+
+ Reviewed by Philippe Normand.
+
+ When ACCELERATED_2D_CANVAS is enabled the MediaPlayerPrivate uses both PlatformDisplay and
+ GLContext that were undefined. Apart from that all the MediaPlayer::PreLoad::None enums fail
+ because cairo-gl.h ends up including X.h which already defines None.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:
+
2020-01-30 Antoine Quint <[email protected]>
[Web Animations] Changing the delay of an accelerated animation doesn't seek the animation
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp (255422 => 255423)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-01-30 13:47:58 UTC (rev 255422)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp 2020-01-30 14:12:24 UTC (rev 255423)
@@ -137,6 +137,10 @@
#include "TextureMapperPlatformLayerProxy.h"
#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
#include <cairo-gl.h>
+#include "GLContext.h"
+#include "PlatformDisplay.h"
+// cairo-gl.h ends up including X.h, which defines None, breaking MediaPlayer:: enums.
+#undef None
#endif
#endif // USE(TEXTURE_MAPPER_GL)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
