Title: [205698] releases/WebKitGTK/webkit-2.14/Source/WebCore
- Revision
- 205698
- Author
- [email protected]
- Date
- 2016-09-08 23:59:20 -0700 (Thu, 08 Sep 2016)
Log Message
Merge r205430 - MediaPlayerPrivateGStreamerBase: improve build guards in nativeImageForCurrentTime()
https://bugs.webkit.org/show_bug.cgi?id=161594
Reviewed by Philippe Normand.
Guard the uses of cairo-gl API in nativeImageForCurrentTime() with the
USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS) pair of build guards. This
API is only made available when the ACCELERATED_2D_CANVAS option is
enabled. Placing the guards this way thus avoids compilation errors
when compiling USE_GSTREAMER_GL code without the accelerated 2D canvas
support enabled.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205697 => 205698)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-09 06:48:55 UTC (rev 205697)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-09 06:59:20 UTC (rev 205698)
@@ -1,3 +1,20 @@
+2016-09-05 Zan Dobersek <[email protected]>
+
+ MediaPlayerPrivateGStreamerBase: improve build guards in nativeImageForCurrentTime()
+ https://bugs.webkit.org/show_bug.cgi?id=161594
+
+ Reviewed by Philippe Normand.
+
+ Guard the uses of cairo-gl API in nativeImageForCurrentTime() with the
+ USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS) pair of build guards. This
+ API is only made available when the ACCELERATED_2D_CANVAS option is
+ enabled. Placing the guards this way thus avoids compilation errors
+ when compiling USE_GSTREAMER_GL code without the accelerated 2D canvas
+ support enabled.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime):
+
2016-09-04 Antti Koivisto <[email protected]>
Remove Style::PendingResources
Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (205697 => 205698)
--- releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-09-09 06:48:55 UTC (rev 205697)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-09-09 06:59:20 UTC (rev 205698)
@@ -684,10 +684,7 @@
#if USE(GSTREAMER_GL)
NativeImagePtr MediaPlayerPrivateGStreamerBase::nativeImageForCurrentTime()
{
-#if !USE(CAIRO) || !ENABLE(ACCELERATED_2D_CANVAS)
- return nullptr;
-#endif
-
+#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
if (m_usingFallbackVideoSink)
return nullptr;
@@ -746,6 +743,9 @@
gst_video_frame_unmap(&videoFrame);
return rotatedSurface;
+#else
+ return nullptr;
+#endif
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
