Title: [206863] trunk/Source/WebCore
- Revision
- 206863
- Author
- commit-qu...@webkit.org
- Date
- 2016-10-06 06:07:56 -0700 (Thu, 06 Oct 2016)
Log Message
[GTK] Fix build with GSTREAMER_GL enabled and ACCELERATED_2D_CANVAS disabled
https://bugs.webkit.org/show_bug.cgi?id=163008
Patch by Miguel Gomez <mago...@igalia.com> on 2016-10-06
Reviewed by Carlos Garcia Campos.
Put functions using cairo-gl behind appropriate guards.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
(WebCore::MediaPlayerPrivateGStreamerBase::paintToCairoSurface): Deleted.
* platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206862 => 206863)
--- trunk/Source/WebCore/ChangeLog 2016-10-06 10:53:28 UTC (rev 206862)
+++ trunk/Source/WebCore/ChangeLog 2016-10-06 13:07:56 UTC (rev 206863)
@@ -1,5 +1,18 @@
2016-10-06 Miguel Gomez <mago...@igalia.com>
+ [GTK] Fix build with GSTREAMER_GL enabled and ACCELERATED_2D_CANVAS disabled
+ https://bugs.webkit.org/show_bug.cgi?id=163008
+
+ Reviewed by Carlos Garcia Campos.
+
+ Put functions using cairo-gl behind appropriate guards.
+
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp:
+ (WebCore::MediaPlayerPrivateGStreamerBase::paintToCairoSurface): Deleted.
+ * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h:
+
+2016-10-06 Miguel Gomez <mago...@igalia.com>
+
[GTK] Copying video textures to webgl should not depend on cairo-gl
https://bugs.webkit.org/show_bug.cgi?id=162904
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (206862 => 206863)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-10-06 10:53:28 UTC (rev 206862)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp 2016-10-06 13:07:56 UTC (rev 206863)
@@ -713,6 +713,7 @@
#endif
#if USE(GSTREAMER_GL)
+#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
// This should be called with the sample mutex locked.
GLContext* MediaPlayerPrivateGStreamerBase::prepareContextForCairoPaint(GstVideoInfo& videoInfo, IntSize& size, IntSize& rotatedSize)
{
@@ -779,6 +780,7 @@
return true;
}
+#endif // USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
bool MediaPlayerPrivateGStreamerBase::copyVideoTextureToPlatformTexture(GraphicsContext3D* context, Platform3DObject outputTexture, GC3Denum outputTarget, GC3Dint level, GC3Denum internalFormat, GC3Denum format, GC3Denum type, bool premultiplyAlpha, bool flipY)
{
Modified: trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h (206862 => 206863)
--- trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-10-06 10:53:28 UTC (rev 206862)
+++ trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.h 2016-10-06 13:07:56 UTC (rev 206863)
@@ -133,9 +133,11 @@
static GstFlowReturn newPrerollCallback(GstElement*, MediaPlayerPrivateGStreamerBase*);
GstElement* createGLAppSink();
GstElement* createVideoSinkGL();
+#if USE(CAIRO) && ENABLE(ACCELERATED_2D_CANVAS)
GLContext* prepareContextForCairoPaint(GstVideoInfo&, IntSize&, IntSize&);
bool paintToCairoSurface(cairo_surface_t*, cairo_device_t*, GstVideoInfo&, const IntSize&, const IntSize&, bool);
#endif
+#endif
void setStreamVolumeElement(GstStreamVolume*);
virtual GstElement* createAudioSink() { return 0; }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
