Title: [191580] releases/WebKitGTK/webkit-2.10/Source/WebCore
- Revision
- 191580
- Author
- [email protected]
- Date
- 2015-10-26 02:31:30 -0700 (Mon, 26 Oct 2015)
Log Message
Merge r191549 - [TexMap] Fix a misused flag for GstGL
https://bugs.webkit.org/show_bug.cgi?id=150545
Reviewed by Žan Doberšek.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
We should pass TextureMapperGL::Flags to the TextureMapperGL::drawTexture instead of
BitmapTexture::Flags.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (191579 => 191580)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-26 09:30:10 UTC (rev 191579)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-10-26 09:31:30 UTC (rev 191580)
@@ -1,3 +1,15 @@
+2015-10-25 Gwang Yoon Hwang <[email protected]>
+
+ [TexMap] Fix a misused flag for GstGL
+ https://bugs.webkit.org/show_bug.cgi?id=150545
+
+ Reviewed by Žan Doberšek.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::paintToTextureMapper):
+ We should pass TextureMapperGL::Flags to the TextureMapperGL::drawTexture instead of
+ BitmapTexture::Flags.
+
2015-10-24 Gwang Yoon Hwang <[email protected]>
[TexMap] Clean up BitmapTexture and BitmapTextureGL.
Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (191579 => 191580)
--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-26 09:30:10 UTC (rev 191579)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2015-10-26 09:31:30 UTC (rev 191580)
@@ -558,9 +558,7 @@
return;
unsigned textureID = *reinterpret_cast<unsigned*>(videoFrame.data[0]);
- BitmapTexture::Flags flags = BitmapTexture::NoFlag;
- if (GST_VIDEO_INFO_HAS_ALPHA(&videoInfo))
- flags |= BitmapTexture::SupportsAlpha;
+ TextureMapperGL::Flags flags = GST_VIDEO_INFO_HAS_ALPHA(&videoInfo) ? TextureMapperGL::ShouldBlend : 0;
IntSize size = IntSize(GST_VIDEO_INFO_WIDTH(&videoInfo), GST_VIDEO_INFO_HEIGHT(&videoInfo));
TextureMapperGL* textureMapperGL = reinterpret_cast<TextureMapperGL*>(textureMapper);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
