Title: [276915] trunk/Source/WebCore
- Revision
- 276915
- Author
- [email protected]
- Date
- 2021-05-03 12:15:16 -0700 (Mon, 03 May 2021)
Log Message
[GTK] Build with VIDEO=OFF fails
https://bugs.webkit.org/show_bug.cgi?id=225316
Patch by Philippe Normand <[email protected]> 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).
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (276914 => 276915)
--- trunk/Source/WebCore/ChangeLog 2021-05-03 19:00:47 UTC (rev 276914)
+++ trunk/Source/WebCore/ChangeLog 2021-05-03 19:15:16 UTC (rev 276915)
@@ -1,3 +1,15 @@
+2021-05-03 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
Transfer ownership to ARC in speechSynthesisGetDefaultVoiceIdentifierForLocale
Modified: trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp (276914 => 276915)
--- trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2021-05-03 19:00:47 UTC (rev 276914)
+++ trunk/Source/WebCore/platform/audio/PlatformMediaSession.cpp 2021-05-03 19:15:16 UTC (rev 276915)
@@ -376,7 +376,12 @@
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
}
bool PlatformMediaSession::canPlayConcurrently(const PlatformMediaSession& otherSession) const
Modified: trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h (276914 => 276915)
--- trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-05-03 19:00:47 UTC (rev 276914)
+++ trunk/Source/WebCore/platform/graphics/opengl/GraphicsContextGLOpenGL.h 2021-05-03 19:15:16 UTC (rev 276915)
@@ -34,6 +34,7 @@
#include <wtf/ListHashSet.h>
#include <wtf/RetainPtr.h>
#include <wtf/UniqueArray.h>
+#include <wtf/UniqueRef.h>
#if PLATFORM(COCOA)
#include "GraphicsContextGLANGLEEGLUtilities.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
