Changeset 276915 in webkit

Timestamp:

May 3, 2021, 12:15:16 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Build with VIDEO=OFF fails
​https://bugs.webkit.org/show_bug.cgi?id=225316

Patch by Philippe Normand <​pnormand@igalia.com> on 2021-05-03
Reviewed by Adrian Perez de Castro.

• platform/audio/PlatformMediaSession.cpp:

(WebCore::isPlayingAudio): Guard against invalid media types, when video is disabled we can
safely return false here as well.

• platform/graphics/opengl/GraphicsContextGLOpenGL.h: Include what we use (UniqueRef).

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/audio/PlatformMediaSession.cpp (modified) (1 diff)
• platform/graphics/opengl/GraphicsContextGLOpenGL.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-03  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] Build with VIDEO=OFF fails
+        https://bugs.webkit.org/show_bug.cgi?id=225316
+
+        Reviewed by Adrian Perez de Castro.
+
+        * platform/audio/PlatformMediaSession.cpp:
+        (WebCore::isPlayingAudio): Guard against invalid media types, when video is disabled we can
+        safely return false here as well.
+        * platform/graphics/opengl/GraphicsContextGLOpenGL.h: Include what we use (UniqueRef).
+
 2021-05-03  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp

@@ -377 +377 @@
 static inline bool isPlayingAudio(PlatformMediaSession::MediaType mediaType)
 {
+#if ENABLE(VIDEO)
     return mediaType == MediaElementSession::MediaType::VideoAudio || mediaType == MediaElementSession::MediaType::Audio;
+#else
+    UNUSED_PARAM(mediaType);
+    return false;
+#endif
 }
 

trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h

@@ -35 +35 @@
 #include <wtf/RetainPtr.h>
 #include <wtf/UniqueArray.h>
+#include <wtf/UniqueRef.h>
 
 #if PLATFORM(COCOA)