Title: [237203] trunk/Source/WebCore
- Revision
- 237203
- Author
- commit-qu...@webkit.org
- Date
- 2018-10-16 14:33:25 -0700 (Tue, 16 Oct 2018)
Log Message
Remove superfluous VIDEO build guard
https://bugs.webkit.org/show_bug.cgi?id=190624
Patch by Rob Buis <rb...@igalia.com> on 2018-10-16
Reviewed by Michael Catanzaro.
Remove some instances where the VIDEO build guard is included within another VIDEO build guard.
No new tests. No change in behavior.
* platform/graphics/MediaPlayer.cpp:
(WebCore::buildMediaEnginesVector):
* platform/graphics/MediaPlayer.h:
* platform/graphics/MediaPlayerPrivate.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (237202 => 237203)
--- trunk/Source/WebCore/ChangeLog 2018-10-16 21:01:15 UTC (rev 237202)
+++ trunk/Source/WebCore/ChangeLog 2018-10-16 21:33:25 UTC (rev 237203)
@@ -1,3 +1,19 @@
+2018-10-16 Rob Buis <rb...@igalia.com>
+
+ Remove superfluous VIDEO build guard
+ https://bugs.webkit.org/show_bug.cgi?id=190624
+
+ Reviewed by Michael Catanzaro.
+
+ Remove some instances where the VIDEO build guard is included within another VIDEO build guard.
+
+ No new tests. No change in behavior.
+
+ * platform/graphics/MediaPlayer.cpp:
+ (WebCore::buildMediaEnginesVector):
+ * platform/graphics/MediaPlayer.h:
+ * platform/graphics/MediaPlayerPrivate.h:
+
2018-10-16 Youenn Fablet <you...@apple.com>
Support RTCConfiguration.certificates
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp (237202 => 237203)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2018-10-16 21:01:15 UTC (rev 237202)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.cpp 2018-10-16 21:33:25 UTC (rev 237203)
@@ -54,7 +54,7 @@
#if USE(GSTREAMER)
#include "MediaPlayerPrivateGStreamer.h"
#define PlatformMediaEngineClassName MediaPlayerPrivateGStreamer
-#if ENABLE(VIDEO) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
#include "MediaPlayerPrivateGStreamerMSE.h"
#endif
#endif // USE(GSTREAMER)
@@ -250,7 +250,7 @@
PlatformMediaEngineClassName::registerMediaEngine(addMediaEngine);
#endif
-#if ENABLE(VIDEO) && USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
+#if USE(GSTREAMER) && ENABLE(MEDIA_SOURCE) && ENABLE(VIDEO_TRACK)
if (DeprecatedGlobalSettings::isGStreamerEnabled())
MediaPlayerPrivateGStreamerMSE::registerMediaEngine(addMediaEngine);
#endif
@@ -1528,7 +1528,7 @@
m_private->applicationDidBecomeActive();
}
-#if ENABLE(VIDEO) && USE(AVFOUNDATION)
+#if USE(AVFOUNDATION)
AVPlayer* MediaPlayer::objCAVFoundationAVPlayer() const
{
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayer.h (237202 => 237203)
--- trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2018-10-16 21:01:15 UTC (rev 237202)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayer.h 2018-10-16 21:33:25 UTC (rev 237203)
@@ -567,7 +567,7 @@
void applicationWillResignActive();
void applicationDidBecomeActive();
-#if ENABLE(VIDEO) && USE(AVFOUNDATION)
+#if USE(AVFOUNDATION)
WEBCORE_EXPORT AVPlayer *objCAVFoundationAVPlayer() const;
#endif
Modified: trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h (237202 => 237203)
--- trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2018-10-16 21:01:15 UTC (rev 237202)
+++ trunk/Source/WebCore/platform/graphics/MediaPlayerPrivate.h 2018-10-16 21:33:25 UTC (rev 237203)
@@ -278,7 +278,7 @@
virtual void applicationWillResignActive() { }
virtual void applicationDidBecomeActive() { }
-#if ENABLE(VIDEO) && USE(AVFOUNDATION)
+#if USE(AVFOUNDATION)
virtual AVPlayer *objCAVFoundationAVPlayer() const { return nullptr; }
#endif
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
