Changeset 205430 in webkit

Timestamp:

Sep 5, 2016 12:15:50 AM (8 years ago)

Author:

zandobersek@gmail.com

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-05  Zan Dobersek  <zdobersek@igalia.com>
+
+        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  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp

@@ -683 +683 @@
 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;
@@ -745 +742 @@
 
     return rotatedSurface;
+#else
+    return nullptr;
+#endif
 }
 #endif