Title: [224533] trunk/Source/WebCore
- Revision
- 224533
- Author
- ape...@igalia.com
- Date
- 2017-11-07 08:28:24 -0800 (Tue, 07 Nov 2017)
Log Message
[WPE][GTK] Building with ENABLE_VIDEO=OFF fails to find AudioTrack.idl
https://bugs.webkit.org/show_bug.cgi?id=179372
Reviewed by Michael Catanzaro.
Arrange MSE extensions defined in {Audio,Text,Video}TrackMediaSource.idl to be
only used for building when both ENABLE_VIDEO_TRACK and ENABLE_MEDIA_SOURCE are
enabled.
No new tests needed.
* CMakeLists.txt: Add conditional for ENABLE_MEDIA_SOURCE and move the addition
of the IDL files to the build there.
* Sources.txt: Conversely, source unification should skip sources derived from
the IDL files when ENABLE_MEDIA_SOURCE disabled, so add guards as well.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (224532 => 224533)
--- trunk/Source/WebCore/CMakeLists.txt 2017-11-07 16:25:58 UTC (rev 224532)
+++ trunk/Source/WebCore/CMakeLists.txt 2017-11-07 16:28:24 UTC (rev 224533)
@@ -270,14 +270,11 @@
Modules/mediasession/MediaRemoteControls.idl
Modules/mediasession/MediaSession.idl
- Modules/mediasource/AudioTrackMediaSource.idl
Modules/mediasource/DOMURLMediaSource.idl
Modules/mediasource/MediaSource.idl
Modules/mediasource/SourceBuffer.idl
Modules/mediasource/SourceBufferList.idl
- Modules/mediasource/TextTrackMediaSource.idl
Modules/mediasource/VideoPlaybackQuality.idl
- Modules/mediasource/VideoTrackMediaSource.idl
Modules/mediastream/CanvasCaptureMediaStreamTrack.idl
Modules/mediastream/DoubleRange.idl
@@ -1226,6 +1223,14 @@
html/track/VideoTrackList.idl
)
+ if (ENABLE_MEDIA_SOURCE)
+ list(APPEND WebCore_IDL_FILES
+ Modules/mediasource/AudioTrackMediaSource.idl
+ Modules/mediasource/TextTrackMediaSource.idl
+ Modules/mediasource/VideoTrackMediaSource.idl
+ )
+ endif ()
+
list(APPEND WebCore_SOURCES
html/track/AudioTrack.cpp
html/track/AudioTrackList.cpp
Modified: trunk/Source/WebCore/ChangeLog (224532 => 224533)
--- trunk/Source/WebCore/ChangeLog 2017-11-07 16:25:58 UTC (rev 224532)
+++ trunk/Source/WebCore/ChangeLog 2017-11-07 16:28:24 UTC (rev 224533)
@@ -1,3 +1,21 @@
+2017-11-07 Adrian Perez de Castro <ape...@igalia.com>
+
+ [WPE][GTK] Building with ENABLE_VIDEO=OFF fails to find AudioTrack.idl
+ https://bugs.webkit.org/show_bug.cgi?id=179372
+
+ Reviewed by Michael Catanzaro.
+
+ Arrange MSE extensions defined in {Audio,Text,Video}TrackMediaSource.idl to be
+ only used for building when both ENABLE_VIDEO_TRACK and ENABLE_MEDIA_SOURCE are
+ enabled.
+
+ No new tests needed.
+
+ * CMakeLists.txt: Add conditional for ENABLE_MEDIA_SOURCE and move the addition
+ of the IDL files to the build there.
+ * Sources.txt: Conversely, source unification should skip sources derived from
+ the IDL files when ENABLE_MEDIA_SOURCE disabled, so add guards as well.
+
2017-11-07 Youenn Fablet <you...@apple.com>
Support the case of fetch events that are not responded
Modified: trunk/Source/WebCore/Sources.txt (224532 => 224533)
--- trunk/Source/WebCore/Sources.txt 2017-11-07 16:25:58 UTC (rev 224532)
+++ trunk/Source/WebCore/Sources.txt 2017-11-07 16:28:24 UTC (rev 224533)
@@ -2262,7 +2262,6 @@
JSAudioNode.cpp
JSAudioParam.cpp
JSAudioProcessingEvent.cpp
-JSAudioTrackMediaSource.cpp
JSBarProp.cpp
JSBasicCredential.cpp
JSBeforeLoadEvent.cpp
@@ -2902,7 +2901,6 @@
JSTextEncoder.cpp
JSTextEvent.cpp
JSTextMetrics.cpp
-JSTextTrackMediaSource.cpp
JSTimeRanges.cpp
JSTransitionEvent.cpp
JSTreeWalker.cpp
@@ -2922,7 +2920,6 @@
JSVRStageParameters.cpp
JSValidityState.cpp
JSVideoPlaybackQuality.cpp
-JSVideoTrackMediaSource.cpp
JSVisibilityState.cpp
JSVoidCallback.cpp
JSWaveShaperNode.cpp
@@ -3081,8 +3078,14 @@
JSVideoTrack.cpp
JSVideoTrackList.cpp
+#if ENABLE_MEDIA_SOURCE
+JSAudioTrackMediaSource.cpp
+JSTextTrackMediaSource.cpp
+JSVideoTrackMediaSource.cpp
#endif
+#endif
+
#if ENABLE_QUOTA
JSDOMWindowQuota.cpp
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
