Add a WebRTC specific compile flag
https://bugs.webkit.org/show_bug.cgi?id=155663
.:
Reviewed by Jer Noble.
* Source/cmake/OptionsEfl.cmake:
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitFeatures.cmake:
Source/WebCore:
Guard WebRTC-only files with ENABLE(WEB_RTC) rather than ENABLE(MEDIA_STREAM).
Reviewed by Jer Noble.
* Modules/mediastream/MediaEndpointPeerConnection.cpp:
* Modules/mediastream/MediaEndpointPeerConnection.h:
* Modules/mediastream/PeerConnectionBackend.h:
* Modules/mediastream/PeerConnectionStates.h:
* Modules/mediastream/RTCConfiguration.cpp:
* Modules/mediastream/RTCConfiguration.h:
* Modules/mediastream/RTCConfiguration.idl:
* Modules/mediastream/RTCDTMFSender.cpp:
* Modules/mediastream/RTCDTMFSender.h:
* Modules/mediastream/RTCDTMFSender.idl:
* Modules/mediastream/RTCDTMFToneChangeEvent.cpp:
* Modules/mediastream/RTCDTMFToneChangeEvent.h:
* Modules/mediastream/RTCDTMFToneChangeEvent.idl:
* Modules/mediastream/RTCDataChannel.cpp:
* Modules/mediastream/RTCDataChannel.h:
* Modules/mediastream/RTCDataChannel.idl:
* Modules/mediastream/RTCDataChannelEvent.cpp:
* Modules/mediastream/RTCDataChannelEvent.h:
* Modules/mediastream/RTCDataChannelEvent.idl:
* Modules/mediastream/RTCIceCandidate.cpp:
* Modules/mediastream/RTCIceCandidate.h:
* Modules/mediastream/RTCIceCandidate.idl:
* Modules/mediastream/RTCIceCandidateEvent.cpp:
* Modules/mediastream/RTCIceCandidateEvent.h:
* Modules/mediastream/RTCIceCandidateEvent.idl:
* Modules/mediastream/RTCIceServer.h:
* Modules/mediastream/RTCIceServer.idl:
* Modules/mediastream/RTCOfferAnswerOptions.cpp:
* Modules/mediastream/RTCOfferAnswerOptions.h:
* Modules/mediastream/RTCPeerConnection.cpp:
* Modules/mediastream/RTCPeerConnection.h:
* Modules/mediastream/RTCPeerConnection.idl:
* Modules/mediastream/RTCPeerConnection.js:
(createOffer):
* Modules/mediastream/RTCPeerConnectionInternals.js:
* Modules/mediastream/RTCRtpReceiver.cpp:
* Modules/mediastream/RTCRtpReceiver.h:
* Modules/mediastream/RTCRtpReceiver.idl:
* Modules/mediastream/RTCRtpSender.cpp:
* Modules/mediastream/RTCRtpSender.h:
* Modules/mediastream/RTCRtpSender.idl:
* Modules/mediastream/RTCRtpSenderReceiverBase.h:
* Modules/mediastream/RTCSessionDescription.cpp:
* Modules/mediastream/RTCSessionDescription.h:
* Modules/mediastream/RTCSessionDescription.idl:
* Modules/mediastream/RTCStatsReport.cpp:
* Modules/mediastream/RTCStatsReport.idl:
* Modules/mediastream/RTCStatsResponse.cpp:
* Modules/mediastream/RTCStatsResponse.idl:
* Modules/mediastream/RTCTrackEvent.cpp:
* Modules/mediastream/RTCTrackEvent.h:
* Modules/mediastream/RTCTrackEvent.idl:
* Modules/mediastream/SDPProcessor.cpp:
* Modules/mediastream/SDPProcessor.h:
* bindings/generic/RuntimeEnabledFeatures.cpp:
(WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
* bindings/generic/RuntimeEnabledFeatures.h:
(WebCore::RuntimeEnabledFeatures::setMediaStreamEnabled):
(WebCore::RuntimeEnabledFeatures::webkitGetUserMediaEnabled):
(WebCore::RuntimeEnabledFeatures::webkitMediaStreamEnabled):
(WebCore::RuntimeEnabledFeatures::peerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::setPeerConnectionEnabled):
(WebCore::RuntimeEnabledFeatures::webkitRTCPeerConnectionEnabled):
* bindings/js/JSDOMGlobalObject.cpp:
(WebCore::JSDOMGlobalObject::addBuiltinGlobals):
* bindings/js/JSDictionary.cpp:
(WebCore::JSDictionary::convertValue):
* bindings/js/JSDictionary.h:
* bindings/js/JSRTCIceCandidateCustom.cpp:
* bindings/js/JSRTCPeerConnectionCustom.cpp:
* bindings/js/JSRTCSessionDescriptionCustom.cpp:
* bindings/js/JSRTCStatsResponseCustom.cpp:
* bindings/js/WebCoreJSBuiltinInternals.cpp:
(WebCore::JSBuiltinInternalFunctions::JSBuiltinInternalFunctions):
(WebCore::JSBuiltinInternalFunctions::visit):
(WebCore::JSBuiltinInternalFunctions::initialize):
* bindings/js/WebCoreJSBuiltinInternals.h:
(WebCore::JSBuiltinInternalFunctions::rtcPeerConnectionInternals):
* bindings/js/WebCoreJSBuiltins.h:
(WebCore::JSBuiltinFunctions::JSBuiltinFunctions):
(WebCore::JSBuiltinFunctions::mediaDevicesBuiltins):
(WebCore::JSBuiltinFunctions::navigatorUserMediaBuiltins):
(WebCore::JSBuiltinFunctions::rtcPeerConnectionBuiltins):
(WebCore::JSBuiltinFunctions::rtcPeerConnectionInternalsBuiltins):
* dom/EventNames.in:
* dom/EventTargetFactory.in:
* loader/FrameLoaderClient.h:
* platform/mediastream/IceCandidate.h:
* platform/mediastream/MediaEndpoint.cpp:
* platform/mediastream/MediaEndpoint.h:
* platform/mediastream/MediaEndpointConfiguration.cpp:
* platform/mediastream/MediaEndpointConfiguration.h:
* platform/mediastream/MediaEndpointSessionConfiguration.h:
* platform/mediastream/MediaPayload.h:
* platform/mediastream/PeerMediaDescription.h:
* platform/mediastream/RTCConfigurationPrivate.h:
* platform/mediastream/RTCDTMFSenderHandler.h:
* platform/mediastream/RTCDTMFSenderHandlerClient.h:
* platform/mediastream/RTCDataChannelHandler.h:
* platform/mediastream/RTCDataChannelHandlerClient.h:
* platform/mediastream/RTCIceCandidateDescriptor.cpp:
* platform/mediastream/RTCIceCandidateDescriptor.h:
* platform/mediastream/RTCIceServerPrivate.h:
* platform/mediastream/RTCPeerConnectionHandler.cpp:
* platform/mediastream/RTCPeerConnectionHandler.h:
* platform/mediastream/RTCPeerConnectionHandlerClient.h:
* platform/mediastream/RTCSessionDescriptionDescriptor.cpp:
* platform/mediastream/RTCSessionDescriptionDescriptor.h:
* platform/mediastream/RTCSessionDescriptionRequest.h:
* platform/mediastream/RTCStatsRequest.h:
* platform/mediastream/RTCStatsResponseBase.h:
* platform/mediastream/RTCVoidRequest.h:
* platform/mediastream/SDPProcessorScriptResource.cpp:
* platform/mediastream/SDPProcessorScriptResource.h:
* platform/mock/MockMediaEndpoint.cpp:
* platform/mock/MockMediaEndpoint.h:
* platform/mock/RTCDTMFSenderHandlerMock.cpp:
* platform/mock/RTCDTMFSenderHandlerMock.h:
* platform/mock/RTCDataChannelHandlerMock.cpp:
* platform/mock/RTCDataChannelHandlerMock.h:
* platform/mock/RTCNotifiersMock.cpp:
* platform/mock/RTCNotifiersMock.h:
* platform/mock/RTCPeerConnectionHandlerMock.cpp:
* platform/mock/RTCPeerConnectionHandlerMock.h:
* platform/mock/TimerEventBasedMock.h:
(WebCore::RenderLayerBacking::paintIntoLayer):
* testing/Internals.cpp:
(WebCore::Internals::Internals):
(WebCore::Internals::enableMockSpeechSynthesizer):
(WebCore::Internals::enableMockMediaEndpoint):
(WebCore::Internals::enableMockRTCPeerConnectionHandler):
(WebCore::Internals::setMockMediaCaptureDevicesEnabled):
* testing/Internals.h:
LayoutTests:
Reviewed by Jer Noble.
* platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
* platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
* platform/mac/js/dom/global-constructors-attributes-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@198492 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/ChangeLog b/ChangeLog
index 2624b0d..71beecd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2016-03-21 Eric Carlson <eric.carlson@apple.com>
+
+ Add a WebRTC specific compile flag
+ https://bugs.webkit.org/show_bug.cgi?id=155663
+
+ Reviewed by Jer Noble.
+
+ * Source/cmake/OptionsEfl.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/WebKitFeatures.cmake:
+
2016-03-18 Yusuke Suzuki <utatane.tea@gmail.com>
Unreviewed, missing SET_AND_EXPOSE_TO_BUILD for USE_UDIS86 in JSCOnly port
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index add93c2..14d86a8 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2016-03-21 Eric Carlson <eric.carlson@apple.com>
+
+ Add a WebRTC specific compile flag
+ https://bugs.webkit.org/show_bug.cgi?id=155663
+
+ Reviewed by Jer Noble.
+
+ * platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt:
+ * platform/mac/js/dom/global-constructors-attributes-expected.txt:
+
2016-03-21 Ryan Haddad <ryanhaddad@apple.com>
Moving the -expected.txt file for accessibility/radio-button-group-members.html
diff --git a/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
index 07a18e6..4039584 100644
--- a/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac-mavericks/js/dom/global-constructors-attributes-expected.txt
@@ -1023,31 +1023,6 @@
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').value is RTCIceCandidate
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').value is RTCRtpReceiver
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').value is RTCRtpSender
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').value is RTCSessionDescription
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').value is RTCTrackEvent
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').value is RadioNodeList
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').hasOwnProperty('set') is false
@@ -2193,11 +2168,6 @@
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').value is webkitRTCPeerConnection
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').value is webkitURL
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('set') is false
diff --git a/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
index 91208b2..19173d0 100644
--- a/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac-yosemite/js/dom/global-constructors-attributes-expected.txt
@@ -1133,31 +1133,6 @@
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').value is RTCIceCandidate
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').value is RTCRtpReceiver
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').value is RTCRtpSender
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').value is RTCSessionDescription
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').value is RTCTrackEvent
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').value is RadioNodeList
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').hasOwnProperty('set') is false
@@ -2378,11 +2353,6 @@
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').value is webkitRTCPeerConnection
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').value is webkitURL
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('set') is false
diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
index c91b342..5286624 100644
--- a/LayoutTests/platform/mac/TestExpectations
+++ b/LayoutTests/platform/mac/TestExpectations
@@ -179,6 +179,12 @@
fast/mediastream/RTCPeerConnection-stable.html
fast/mediastream/RTCPeerConnection.html
fast/mediastream/RTCPeerConnection-inspect-offer.html
+fast/mediastream/RTCPeerConnection-add-removeTrack.html
+fast/mediastream/RTCPeerConnection-closed-state.html
+fast/mediastream/RTCPeerConnection-overloaded-operations-params.html
+fast/mediastream/RTCPeerConnection-overloaded-operations.html
+fast/mediastream/RTCRtpSender-replaceTrack.html
+fast/mediastream/RTCSessionDescription.html
# Asserts in debug.
[ Debug ] fast/images/large-size-image-crash.html [ Skip ]
diff --git a/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt b/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
index ae75e2a..06f2982 100644
--- a/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
+++ b/LayoutTests/platform/mac/js/dom/global-constructors-attributes-expected.txt
@@ -1133,31 +1133,6 @@
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'RGBColor').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').value is RTCIceCandidate
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCIceCandidate').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').value is RTCRtpReceiver
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpReceiver').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').value is RTCRtpSender
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCRtpSender').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').value is RTCSessionDescription
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCSessionDescription').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').value is RTCTrackEvent
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'RTCTrackEvent').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').value is RadioNodeList
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'RadioNodeList').hasOwnProperty('set') is false
@@ -2383,11 +2358,6 @@
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').hasOwnProperty('set') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').enumerable is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitOfflineAudioContext').configurable is true
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').value is webkitRTCPeerConnection
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('get') is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').hasOwnProperty('set') is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').enumerable is false
-PASS Object.getOwnPropertyDescriptor(global, 'webkitRTCPeerConnection').configurable is true
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').value is webkitURL
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('get') is false
PASS Object.getOwnPropertyDescriptor(global, 'webkitURL').hasOwnProperty('set') is false
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 61b0f14..9288f42 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,146 @@
+2016-03-21 Eric Carlson <eric.carlson@apple.com>
+
+ Add a WebRTC specific compile flag
+ https://bugs.webkit.org/show_bug.cgi?id=155663
+
+ Guard WebRTC-only files with ENABLE(WEB_RTC) rather than ENABLE(MEDIA_STREAM).
+
+ Reviewed by Jer Noble.
+
+ * Modules/mediastream/MediaEndpointPeerConnection.cpp:
+ * Modules/mediastream/MediaEndpointPeerConnection.h:
+ * Modules/mediastream/PeerConnectionBackend.h:
+ * Modules/mediastream/PeerConnectionStates.h:
+ * Modules/mediastream/RTCConfiguration.cpp:
+ * Modules/mediastream/RTCConfiguration.h:
+ * Modules/mediastream/RTCConfiguration.idl:
+ * Modules/mediastream/RTCDTMFSender.cpp:
+ * Modules/mediastream/RTCDTMFSender.h:
+ * Modules/mediastream/RTCDTMFSender.idl:
+ * Modules/mediastream/RTCDTMFToneChangeEvent.cpp:
+ * Modules/mediastream/RTCDTMFToneChangeEvent.h:
+ * Modules/mediastream/RTCDTMFToneChangeEvent.idl:
+ * Modules/mediastream/RTCDataChannel.cpp:
+ * Modules/mediastream/RTCDataChannel.h:
+ * Modules/mediastream/RTCDataChannel.idl:
+ * Modules/mediastream/RTCDataChannelEvent.cpp:
+ * Modules/mediastream/RTCDataChannelEvent.h:
+ * Modules/mediastream/RTCDataChannelEvent.idl:
+ * Modules/mediastream/RTCIceCandidate.cpp:
+ * Modules/mediastream/RTCIceCandidate.h:
+ * Modules/mediastream/RTCIceCandidate.idl:
+ * Modules/mediastream/RTCIceCandidateEvent.cpp:
+ * Modules/mediastream/RTCIceCandidateEvent.h:
+ * Modules/mediastream/RTCIceCandidateEvent.idl:
+ * Modules/mediastream/RTCIceServer.h:
+ * Modules/mediastream/RTCIceServer.idl:
+ * Modules/mediastream/RTCOfferAnswerOptions.cpp:
+ * Modules/mediastream/RTCOfferAnswerOptions.h:
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ * Modules/mediastream/RTCPeerConnection.h:
+ * Modules/mediastream/RTCPeerConnection.idl:
+ * Modules/mediastream/RTCPeerConnection.js:
+ (createOffer):
+ * Modules/mediastream/RTCPeerConnectionInternals.js:
+ * Modules/mediastream/RTCRtpReceiver.cpp:
+ * Modules/mediastream/RTCRtpReceiver.h:
+ * Modules/mediastream/RTCRtpReceiver.idl:
+ * Modules/mediastream/RTCRtpSender.cpp:
+ * Modules/mediastream/RTCRtpSender.h:
+ * Modules/mediastream/RTCRtpSender.idl:
+ * Modules/mediastream/RTCRtpSenderReceiverBase.h:
+ * Modules/mediastream/RTCSessionDescription.cpp:
+ * Modules/mediastream/RTCSessionDescription.h:
+ * Modules/mediastream/RTCSessionDescription.idl:
+ * Modules/mediastream/RTCStatsReport.cpp:
+ * Modules/mediastream/RTCStatsReport.idl:
+ * Modules/mediastream/RTCStatsResponse.cpp:
+ * Modules/mediastream/RTCStatsResponse.idl:
+ * Modules/mediastream/RTCTrackEvent.cpp:
+ * Modules/mediastream/RTCTrackEvent.h:
+ * Modules/mediastream/RTCTrackEvent.idl:
+ * Modules/mediastream/SDPProcessor.cpp:
+ * Modules/mediastream/SDPProcessor.h:
+ * bindings/generic/RuntimeEnabledFeatures.cpp:
+ (WebCore::RuntimeEnabledFeatures::RuntimeEnabledFeatures):
+ * bindings/generic/RuntimeEnabledFeatures.h:
+ (WebCore::RuntimeEnabledFeatures::setMediaStreamEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitGetUserMediaEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitMediaStreamEnabled):
+ (WebCore::RuntimeEnabledFeatures::peerConnectionEnabled):
+ (WebCore::RuntimeEnabledFeatures::setPeerConnectionEnabled):
+ (WebCore::RuntimeEnabledFeatures::webkitRTCPeerConnectionEnabled):
+ * bindings/js/JSDOMGlobalObject.cpp:
+ (WebCore::JSDOMGlobalObject::addBuiltinGlobals):
+ * bindings/js/JSDictionary.cpp:
+ (WebCore::JSDictionary::convertValue):
+ * bindings/js/JSDictionary.h:
+ * bindings/js/JSRTCIceCandidateCustom.cpp:
+ * bindings/js/JSRTCPeerConnectionCustom.cpp:
+ * bindings/js/JSRTCSessionDescriptionCustom.cpp:
+ * bindings/js/JSRTCStatsResponseCustom.cpp:
+ * bindings/js/WebCoreJSBuiltinInternals.cpp:
+ (WebCore::JSBuiltinInternalFunctions::JSBuiltinInternalFunctions):
+ (WebCore::JSBuiltinInternalFunctions::visit):
+ (WebCore::JSBuiltinInternalFunctions::initialize):
+ * bindings/js/WebCoreJSBuiltinInternals.h:
+ (WebCore::JSBuiltinInternalFunctions::rtcPeerConnectionInternals):
+ * bindings/js/WebCoreJSBuiltins.h:
+ (WebCore::JSBuiltinFunctions::JSBuiltinFunctions):
+ (WebCore::JSBuiltinFunctions::mediaDevicesBuiltins):
+ (WebCore::JSBuiltinFunctions::navigatorUserMediaBuiltins):
+ (WebCore::JSBuiltinFunctions::rtcPeerConnectionBuiltins):
+ (WebCore::JSBuiltinFunctions::rtcPeerConnectionInternalsBuiltins):
+ * dom/EventNames.in:
+ * dom/EventTargetFactory.in:
+ * loader/FrameLoaderClient.h:
+ * platform/mediastream/IceCandidate.h:
+ * platform/mediastream/MediaEndpoint.cpp:
+ * platform/mediastream/MediaEndpoint.h:
+ * platform/mediastream/MediaEndpointConfiguration.cpp:
+ * platform/mediastream/MediaEndpointConfiguration.h:
+ * platform/mediastream/MediaEndpointSessionConfiguration.h:
+ * platform/mediastream/MediaPayload.h:
+ * platform/mediastream/PeerMediaDescription.h:
+ * platform/mediastream/RTCConfigurationPrivate.h:
+ * platform/mediastream/RTCDTMFSenderHandler.h:
+ * platform/mediastream/RTCDTMFSenderHandlerClient.h:
+ * platform/mediastream/RTCDataChannelHandler.h:
+ * platform/mediastream/RTCDataChannelHandlerClient.h:
+ * platform/mediastream/RTCIceCandidateDescriptor.cpp:
+ * platform/mediastream/RTCIceCandidateDescriptor.h:
+ * platform/mediastream/RTCIceServerPrivate.h:
+ * platform/mediastream/RTCPeerConnectionHandler.cpp:
+ * platform/mediastream/RTCPeerConnectionHandler.h:
+ * platform/mediastream/RTCPeerConnectionHandlerClient.h:
+ * platform/mediastream/RTCSessionDescriptionDescriptor.cpp:
+ * platform/mediastream/RTCSessionDescriptionDescriptor.h:
+ * platform/mediastream/RTCSessionDescriptionRequest.h:
+ * platform/mediastream/RTCStatsRequest.h:
+ * platform/mediastream/RTCStatsResponseBase.h:
+ * platform/mediastream/RTCVoidRequest.h:
+ * platform/mediastream/SDPProcessorScriptResource.cpp:
+ * platform/mediastream/SDPProcessorScriptResource.h:
+ * platform/mock/MockMediaEndpoint.cpp:
+ * platform/mock/MockMediaEndpoint.h:
+ * platform/mock/RTCDTMFSenderHandlerMock.cpp:
+ * platform/mock/RTCDTMFSenderHandlerMock.h:
+ * platform/mock/RTCDataChannelHandlerMock.cpp:
+ * platform/mock/RTCDataChannelHandlerMock.h:
+ * platform/mock/RTCNotifiersMock.cpp:
+ * platform/mock/RTCNotifiersMock.h:
+ * platform/mock/RTCPeerConnectionHandlerMock.cpp:
+ * platform/mock/RTCPeerConnectionHandlerMock.h:
+ * platform/mock/TimerEventBasedMock.h:
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+ * testing/Internals.cpp:
+ (WebCore::Internals::Internals):
+ (WebCore::Internals::enableMockSpeechSynthesizer):
+ (WebCore::Internals::enableMockMediaEndpoint):
+ (WebCore::Internals::enableMockRTCPeerConnectionHandler):
+ (WebCore::Internals::setMockMediaCaptureDevicesEnabled):
+ * testing/Internals.h:
+
2016-03-21 Joonghun Park <jh718.park@samsung.com>
[JSC] Add ArrayBuffer::tryCreate and change the callsites where it is needed
diff --git a/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp b/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp
index 8ee3008..ce0c581 100644
--- a/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp
+++ b/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MediaEndpointPeerConnection.h"
#include "DOMError.h"
@@ -319,4 +319,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h b/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h
index f15e75e1..dd3ec1a 100644
--- a/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h
+++ b/Source/WebCore/Modules/mediastream/MediaEndpointPeerConnection.h
@@ -31,7 +31,7 @@
#ifndef MediaEndpointPeerConnection_h
#define MediaEndpointPeerConnection_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MediaEndpoint.h"
#include "NotImplemented.h"
@@ -108,6 +108,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // MediaEndpointPeerConnection_h
diff --git a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
index 42580bf..50de930 100644
--- a/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
+++ b/Source/WebCore/Modules/mediastream/PeerConnectionBackend.h
@@ -31,7 +31,7 @@
#ifndef PeerConnectionBackend_h
#define PeerConnectionBackend_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "JSDOMPromise.h"
#include "PeerConnectionStates.h"
@@ -114,6 +114,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // PeerConnectionBackend_h
diff --git a/Source/WebCore/Modules/mediastream/PeerConnectionStates.h b/Source/WebCore/Modules/mediastream/PeerConnectionStates.h
index 6582b65..e2205e6 100644
--- a/Source/WebCore/Modules/mediastream/PeerConnectionStates.h
+++ b/Source/WebCore/Modules/mediastream/PeerConnectionStates.h
@@ -31,7 +31,7 @@
#ifndef PeerConnectionStates_h
#define PeerConnectionStates_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
namespace WebCore {
@@ -66,6 +66,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // PeerConnectionStates_h
diff --git a/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp b/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp
index 393c0a1..2a65a9e 100644
--- a/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCConfiguration.cpp
@@ -33,7 +33,7 @@
#include "config.h"
#include "RTCConfiguration.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "ArrayValue.h"
#include "Dictionary.h"
@@ -162,4 +162,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCConfiguration.h b/Source/WebCore/Modules/mediastream/RTCConfiguration.h
index 004963d..887d4c8 100644
--- a/Source/WebCore/Modules/mediastream/RTCConfiguration.h
+++ b/Source/WebCore/Modules/mediastream/RTCConfiguration.h
@@ -31,7 +31,7 @@
#ifndef RTCConfiguration_h
#define RTCConfiguration_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCIceServer.h"
#include <wtf/RefCounted.h>
@@ -66,6 +66,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCConfiguration_h
diff --git a/Source/WebCore/Modules/mediastream/RTCConfiguration.idl b/Source/WebCore/Modules/mediastream/RTCConfiguration.idl
index a2776d8..7da1d4e 100644
--- a/Source/WebCore/Modules/mediastream/RTCConfiguration.idl
+++ b/Source/WebCore/Modules/mediastream/RTCConfiguration.idl
@@ -27,7 +27,7 @@
enum RTCBundlePolicyEnum { "balanced", "max-compat", "max-bundle" };
[
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
NoInterfaceObject,
] interface RTCConfiguration {
readonly attribute RTCIceServer[] iceServers;
diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp b/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp
index df935f5..e05af3c 100644
--- a/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCDTMFSender.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDTMFSender.h"
@@ -167,4 +167,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFSender.h b/Source/WebCore/Modules/mediastream/RTCDTMFSender.h
index 2e2c882..aca81ae 100644
--- a/Source/WebCore/Modules/mediastream/RTCDTMFSender.h
+++ b/Source/WebCore/Modules/mediastream/RTCDTMFSender.h
@@ -26,7 +26,7 @@
#ifndef RTCDTMFSender_h
#define RTCDTMFSender_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "ActiveDOMObject.h"
#include "EventTarget.h"
@@ -95,6 +95,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDTMFSender_h
diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl b/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl
index 84abc3f..04434ca 100644
--- a/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl
+++ b/Source/WebCore/Modules/mediastream/RTCDTMFSender.idl
@@ -25,7 +25,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
ActiveDOMObject,
] interface RTCDTMFSender : EventTarget {
readonly attribute boolean canInsertDTMF;
diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp
index f75c2b6..13ab152 100644
--- a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.cpp
@@ -26,7 +26,7 @@
#include "config.h"
#include "RTCDTMFToneChangeEvent.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "EventNames.h"
@@ -71,5 +71,5 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h
index df634f8..4a8cb81 100644
--- a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h
+++ b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.h
@@ -26,7 +26,7 @@
#ifndef RTCDTMFToneChangeEvent_h
#define RTCDTMFToneChangeEvent_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "Event.h"
#include <wtf/text/AtomicString.h>
@@ -57,6 +57,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDTMFToneChangeEvent_h
diff --git a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl
index 1edebd3..a75cc1e 100644
--- a/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl
+++ b/Source/WebCore/Modules/mediastream/RTCDTMFToneChangeEvent.idl
@@ -25,7 +25,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
ConstructorTemplate=Event
] interface RTCDTMFToneChangeEvent : Event {
[InitializedByEventConstructor] readonly attribute DOMString tone;
diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
index a9a3909..2601def 100644
--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp
@@ -24,7 +24,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDataChannel.h"
@@ -325,4 +325,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.h b/Source/WebCore/Modules/mediastream/RTCDataChannel.h
index 43d483d..a2fd884 100644
--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.h
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.h
@@ -25,7 +25,7 @@
#ifndef RTCDataChannel_h
#define RTCDataChannel_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "EventTarget.h"
#include "RTCDataChannelHandlerClient.h"
@@ -115,6 +115,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDataChannel_h
diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannel.idl b/Source/WebCore/Modules/mediastream/RTCDataChannel.idl
index 48a7526..e5f86c7 100644
--- a/Source/WebCore/Modules/mediastream/RTCDataChannel.idl
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannel.idl
@@ -24,7 +24,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
] interface RTCDataChannel : EventTarget {
readonly attribute DOMString label;
readonly attribute boolean ordered;
diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp
index fb33a6f..ee25b38 100644
--- a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp
@@ -25,7 +25,7 @@
#include "config.h"
#include "RTCDataChannelEvent.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "EventNames.h"
#include "RTCDataChannel.h"
@@ -59,5 +59,5 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h
index 44e49b0..7561f98 100644
--- a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h
@@ -25,7 +25,7 @@
#ifndef RTCDataChannelEvent_h
#define RTCDataChannelEvent_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "Event.h"
#include "RTCDataChannel.h"
@@ -51,6 +51,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDataChannelEvent_h
diff --git a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.idl b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.idl
index 9463375..1dc11f9 100644
--- a/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.idl
+++ b/Source/WebCore/Modules/mediastream/RTCDataChannelEvent.idl
@@ -24,7 +24,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
] interface RTCDataChannelEvent : Event {
readonly attribute RTCDataChannel channel;
};
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp b/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
index 9e2ed40..f50956a 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp
@@ -32,7 +32,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCIceCandidate.h"
@@ -87,4 +87,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidate.h b/Source/WebCore/Modules/mediastream/RTCIceCandidate.h
index cad6998..a228477 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidate.h
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidate.h
@@ -31,7 +31,7 @@
#ifndef RTCIceCandidate_h
#define RTCIceCandidate_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "ExceptionBase.h"
#include "ScriptWrappable.h"
@@ -70,6 +70,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCIceCandidate_h
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl b/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl
index ddd55a0..cd01ef7 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl
@@ -30,7 +30,7 @@
*/
[
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
CustomConstructor(optional Dictionary dictionary),
ConstructorRaisesException
] interface RTCIceCandidate {
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp
index 3735765..ba62fbb 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.cpp
@@ -24,7 +24,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCIceCandidateEvent.h"
@@ -60,5 +60,5 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.h b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.h
index e90266c..10a6e7a 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.h
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.h
@@ -25,7 +25,7 @@
#ifndef RTCIceCandidateEvent_h
#define RTCIceCandidateEvent_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "Event.h"
#include <wtf/text/AtomicString.h>
@@ -51,6 +51,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCIceCandidateEvent_h
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl
index 3fa0637..ff00d5b 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl
@@ -24,7 +24,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
] interface RTCIceCandidateEvent : Event {
readonly attribute RTCIceCandidate candidate;
};
diff --git a/Source/WebCore/Modules/mediastream/RTCIceServer.h b/Source/WebCore/Modules/mediastream/RTCIceServer.h
index 5ba0d0d..1a397ed 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceServer.h
+++ b/Source/WebCore/Modules/mediastream/RTCIceServer.h
@@ -26,7 +26,7 @@
#ifndef RTCIceServer_h
#define RTCIceServer_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -61,6 +61,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCIceServer_h
diff --git a/Source/WebCore/Modules/mediastream/RTCIceServer.idl b/Source/WebCore/Modules/mediastream/RTCIceServer.idl
index 4144f5b..7c7660d 100644
--- a/Source/WebCore/Modules/mediastream/RTCIceServer.idl
+++ b/Source/WebCore/Modules/mediastream/RTCIceServer.idl
@@ -24,7 +24,7 @@
*/
[
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
NoInterfaceObject,
] interface RTCIceServer {
readonly attribute DOMString[] urls;
diff --git a/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp b/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp
index 5432ef0..9c42a84 100644
--- a/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.cpp
@@ -26,7 +26,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCOfferAnswerOptions.h"
#include <wtf/text/WTFString.h>
@@ -122,4 +122,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h b/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h
index 873e6cd..7fc5743 100644
--- a/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h
+++ b/Source/WebCore/Modules/mediastream/RTCOfferAnswerOptions.h
@@ -27,7 +27,7 @@
#ifndef RTCOfferAnswerOptions_h
#define RTCOfferAnswerOptions_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "Dictionary.h"
#include "ExceptionCode.h"
@@ -79,6 +79,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCOfferAnswerOptions_h
diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp b/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
index 7b7e46c..26b5437 100644
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
@@ -32,7 +32,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCPeerConnection.h"
@@ -441,4 +441,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.h b/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
index d9bcc38..d2fd088 100644
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
@@ -33,7 +33,7 @@
#ifndef RTCPeerConnection_h
#define RTCPeerConnection_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "ActiveDOMObject.h"
#include "Dictionary.h"
@@ -151,6 +151,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCPeerConnection_h
diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl b/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
index a5ae8ed..daec362 100644
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
@@ -31,7 +31,7 @@
*/
[
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
ActiveDOMObject,
CustomConstructor(Dictionary rtcConfiguration),
ConstructorCallWith=ScriptExecutionContext,
diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.js b/Source/WebCore/Modules/mediastream/RTCPeerConnection.js
index d16db42..c3c2d18 100644
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.js
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.js
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// @conditional=ENABLE(MEDIA_STREAM)
+// @conditional=ENABLE(WEB_RTC)
function createOffer()
{
diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js b/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js
index 441c685..6ace5fd 100644
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnectionInternals.js
@@ -28,7 +28,7 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-// @conditional=ENABLE(MEDIA_STREAM)
+// @conditional=ENABLE(WEB_RTC)
// @internal
// Operation queue as specified in section 4.3.1 (WebRTC 1.0)
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
index 23eba31..a20e3c4 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.cpp
@@ -31,7 +31,7 @@
#include "config.h"
#include "RTCRtpReceiver.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
namespace WebCore {
@@ -42,4 +42,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h
index fa552c2..ebf39ad 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h
+++ b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.h
@@ -31,7 +31,7 @@
#ifndef RTCRtpReceiver_h
#define RTCRtpReceiver_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "RTCRtpSenderReceiverBase.h"
@@ -50,6 +50,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCRtpReceiver_h
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl
index bd97c69..c5c61c6 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl
+++ b/Source/WebCore/Modules/mediastream/RTCRtpReceiver.idl
@@ -29,7 +29,7 @@
*/
[
- Conditional=MEDIA_STREAM
+ Conditional=WEB_RTC
] interface RTCRtpReceiver {
readonly attribute MediaStreamTrack track;
};
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp b/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
index f4aadc5..ce62a138 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCRtpSender.cpp
@@ -31,7 +31,7 @@
#include "config.h"
#include "RTCRtpSender.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "DOMError.h"
#include "ExceptionCode.h"
@@ -70,4 +70,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSender.h b/Source/WebCore/Modules/mediastream/RTCRtpSender.h
index 9d9d0d4..00b3ad2 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpSender.h
+++ b/Source/WebCore/Modules/mediastream/RTCRtpSender.h
@@ -31,7 +31,7 @@
#ifndef RTCRtpSender_h
#define RTCRtpSender_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "PeerConnectionBackend.h"
#include "RTCRtpSenderReceiverBase.h"
@@ -70,6 +70,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCRtpSender_h
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSender.idl b/Source/WebCore/Modules/mediastream/RTCRtpSender.idl
index 30272df..3df9064 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpSender.idl
+++ b/Source/WebCore/Modules/mediastream/RTCRtpSender.idl
@@ -29,7 +29,7 @@
*/
[
- Conditional=MEDIA_STREAM
+ Conditional=WEB_RTC
] interface RTCRtpSender {
readonly attribute MediaStreamTrack track;
diff --git a/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h b/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h
index 95290b1..e183385 100644
--- a/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h
+++ b/Source/WebCore/Modules/mediastream/RTCRtpSenderReceiverBase.h
@@ -31,7 +31,7 @@
#ifndef RTCRtpSenderReceiverBase_h
#define RTCRtpSenderReceiverBase_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "MediaStreamTrack.h"
#include "ScriptWrappable.h"
@@ -58,6 +58,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCRtpSenderReceiverBase_h
diff --git a/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp b/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
index ed9bfb9..3dd6da3 100644
--- a/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCSessionDescription.cpp
@@ -31,7 +31,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "RTCSessionDescription.h"
@@ -89,4 +89,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCSessionDescription.h b/Source/WebCore/Modules/mediastream/RTCSessionDescription.h
index b84f846..84882d0 100644
--- a/Source/WebCore/Modules/mediastream/RTCSessionDescription.h
+++ b/Source/WebCore/Modules/mediastream/RTCSessionDescription.h
@@ -31,7 +31,7 @@
#ifndef RTCSessionDescription_h
#define RTCSessionDescription_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "ExceptionCode.h"
#include "ScriptWrappable.h"
@@ -65,6 +65,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCSessionDescription_h
diff --git a/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl b/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl
index e62998b..23455f7 100644
--- a/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl
+++ b/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl
@@ -30,7 +30,7 @@
*/
[
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
CustomConstructor(optional Dictionary dictionary),
ConstructorRaisesException
] interface RTCSessionDescription {
diff --git a/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp b/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp
index a035634..f0df69f 100644
--- a/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCStatsReport.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "RTCStatsReport.h"
@@ -70,4 +70,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCStatsReport.idl b/Source/WebCore/Modules/mediastream/RTCStatsReport.idl
index aa04b73..e834712 100644
--- a/Source/WebCore/Modules/mediastream/RTCStatsReport.idl
+++ b/Source/WebCore/Modules/mediastream/RTCStatsReport.idl
@@ -24,7 +24,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
ImplementationLacksVTable,
] interface RTCStatsReport {
readonly attribute Date timestamp;
diff --git a/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp b/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp
index a26d2b0..39375c2 100644
--- a/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCStatsResponse.cpp
@@ -24,7 +24,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "RTCStatsResponse.h"
@@ -67,4 +67,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCStatsResponse.idl b/Source/WebCore/Modules/mediastream/RTCStatsResponse.idl
index 16634d7..618b31a 100644
--- a/Source/WebCore/Modules/mediastream/RTCStatsResponse.idl
+++ b/Source/WebCore/Modules/mediastream/RTCStatsResponse.idl
@@ -24,7 +24,7 @@
[
NoInterfaceObject,
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
] interface RTCStatsResponse {
sequence<RTCStatsReport> result();
getter RTCStatsReport namedItem([Default=Undefined] optional DOMString name);
diff --git a/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp b/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp
index f81350e..a42334c 100644
--- a/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp
+++ b/Source/WebCore/Modules/mediastream/RTCTrackEvent.cpp
@@ -31,7 +31,7 @@
#include "config.h"
#include "RTCTrackEvent.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "EventNames.h"
#include "MediaStreamTrack.h"
@@ -65,4 +65,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/RTCTrackEvent.h b/Source/WebCore/Modules/mediastream/RTCTrackEvent.h
index 4aa146e..f93e696 100644
--- a/Source/WebCore/Modules/mediastream/RTCTrackEvent.h
+++ b/Source/WebCore/Modules/mediastream/RTCTrackEvent.h
@@ -31,7 +31,7 @@
#ifndef RTCTrackEvent_h
#define RTCTrackEvent_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "Event.h"
#include <wtf/text/AtomicString.h>
@@ -66,6 +66,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCTrackEvent_h
diff --git a/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl b/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl
index 52b056c..d058908 100644
--- a/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl
+++ b/Source/WebCore/Modules/mediastream/RTCTrackEvent.idl
@@ -29,7 +29,7 @@
*/
[
- Conditional=MEDIA_STREAM,
+ Conditional=WEB_RTC,
ConstructorTemplate=Event
] interface RTCTrackEvent : Event {
[InitializedByEventConstructor] readonly attribute RTCRtpReceiver receiver;
diff --git a/Source/WebCore/Modules/mediastream/SDPProcessor.cpp b/Source/WebCore/Modules/mediastream/SDPProcessor.cpp
index 44f2294..05c7678 100644
--- a/Source/WebCore/Modules/mediastream/SDPProcessor.cpp
+++ b/Source/WebCore/Modules/mediastream/SDPProcessor.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "SDPProcessor.h"
#include "Document.h"
@@ -538,4 +538,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/Modules/mediastream/SDPProcessor.h b/Source/WebCore/Modules/mediastream/SDPProcessor.h
index 23b415e..7963baf 100644
--- a/Source/WebCore/Modules/mediastream/SDPProcessor.h
+++ b/Source/WebCore/Modules/mediastream/SDPProcessor.h
@@ -31,7 +31,7 @@
#ifndef SDPProcessor_h
#define SDPProcessor_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "ContextDestructionObserver.h"
#include "IceCandidate.h"
@@ -68,6 +68,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // SDPProcessor_h
diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
index 6666331..867b151 100644
--- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
+++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.cpp
@@ -61,6 +61,8 @@
#endif
#if ENABLE(MEDIA_STREAM)
, m_isMediaStreamEnabled(true)
+#endif
+#if ENABLE(WEBRTC)
, m_isPeerConnectionEnabled(true)
#endif
#if ENABLE(LEGACY_CSS_VENDOR_PREFIXES)
diff --git a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
index 895a4ff..7fb7ec4 100644
--- a/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
+++ b/Source/WebCore/bindings/generic/RuntimeEnabledFeatures.h
@@ -133,7 +133,8 @@
void setMediaStreamEnabled(bool isEnabled) { m_isMediaStreamEnabled = isEnabled; }
bool webkitGetUserMediaEnabled() const { return m_isMediaStreamEnabled; }
bool webkitMediaStreamEnabled() const { return m_isMediaStreamEnabled; }
-
+#endif
+#if ENABLE(WEBRTC)
bool peerConnectionEnabled() const { return m_isMediaStreamEnabled && m_isPeerConnectionEnabled; }
void setPeerConnectionEnabled(bool isEnabled) { m_isPeerConnectionEnabled = isEnabled; }
bool webkitRTCPeerConnectionEnabled() const { return peerConnectionEnabled(); }
@@ -244,6 +245,8 @@
#if ENABLE(MEDIA_STREAM)
bool m_isMediaStreamEnabled;
+#endif
+#if ENABLE(WEBRTC)
bool m_isPeerConnectionEnabled;
#endif
diff --git a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
index abcc64e..f461b0d 100644
--- a/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
+++ b/Source/WebCore/bindings/js/JSDOMGlobalObject.cpp
@@ -90,7 +90,7 @@
#endif
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamControllerPrivateName(), privateReadableStreamControllerConstructor, DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().ReadableStreamReaderPrivateName(), privateReadableStreamReaderConstructor, DontDelete | ReadOnly),
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().RTCIceCandidatePrivateName(), JSRTCIceCandidate::getConstructor(vm, this), DontDelete | ReadOnly),
JSDOMGlobalObject::GlobalPropertyInfo(clientData.builtinNames().RTCSessionDescriptionPrivateName(), JSRTCSessionDescription::getConstructor(vm, this), DontDelete | ReadOnly),
#endif
diff --git a/Source/WebCore/bindings/js/JSDictionary.cpp b/Source/WebCore/bindings/js/JSDictionary.cpp
index e53708a..81f81d0 100644
--- a/Source/WebCore/bindings/js/JSDictionary.cpp
+++ b/Source/WebCore/bindings/js/JSDictionary.cpp
@@ -55,6 +55,9 @@
#if ENABLE(MEDIA_STREAM)
#include "JSMediaStream.h"
#include "JSMediaStreamTrack.h"
+#endif
+
+#if ENABLE(WEB_RTC)
#include "JSRTCRtpReceiver.h"
#endif
@@ -249,7 +252,9 @@
{
result = JSMediaStreamTrack::toWrapped(value);
}
+#endif
+#if ENABLE(WEB_RTC)
void JSDictionary::convertValue(JSC::ExecState*, JSC::JSValue value, RefPtr<RTCRtpReceiver>& result)
{
result = JSRTCRtpReceiver::toWrapped(value);
diff --git a/Source/WebCore/bindings/js/JSDictionary.h b/Source/WebCore/bindings/js/JSDictionary.h
index 54bf799..e119548 100644
--- a/Source/WebCore/bindings/js/JSDictionary.h
+++ b/Source/WebCore/bindings/js/JSDictionary.h
@@ -133,6 +133,8 @@
#if ENABLE(MEDIA_STREAM)
static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaStream>& result);
static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<MediaStreamTrack>& result);
+#endif
+#if ENABLE(WEB_RTC)
static void convertValue(JSC::ExecState*, JSC::JSValue, RefPtr<RTCRtpReceiver>& result);
#endif
#if ENABLE(FONT_LOAD_EVENTS)
diff --git a/Source/WebCore/bindings/js/JSRTCIceCandidateCustom.cpp b/Source/WebCore/bindings/js/JSRTCIceCandidateCustom.cpp
index f8eae00..c01cc16 100644
--- a/Source/WebCore/bindings/js/JSRTCIceCandidateCustom.cpp
+++ b/Source/WebCore/bindings/js/JSRTCIceCandidateCustom.cpp
@@ -26,7 +26,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "JSRTCIceCandidate.h"
@@ -79,5 +79,5 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp b/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp
index e5fe2aa..2b834ef 100644
--- a/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSRTCPeerConnectionCustom.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "JSRTCPeerConnection.h"
@@ -71,4 +71,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/bindings/js/JSRTCSessionDescriptionCustom.cpp b/Source/WebCore/bindings/js/JSRTCSessionDescriptionCustom.cpp
index 74fe8cb..cb6610d 100644
--- a/Source/WebCore/bindings/js/JSRTCSessionDescriptionCustom.cpp
+++ b/Source/WebCore/bindings/js/JSRTCSessionDescriptionCustom.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "JSRTCSessionDescription.h"
@@ -67,5 +67,5 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp b/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp
index 40e5b90..ca5c76f 100644
--- a/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp
+++ b/Source/WebCore/bindings/js/JSRTCStatsResponseCustom.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "JSRTCStatsResponse.h"
#include "JSDOMBinding.h"
@@ -48,4 +48,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp b/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp
index b8f5cd8..1780b83 100644
--- a/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp
+++ b/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.cpp
@@ -40,7 +40,7 @@
JSBuiltinInternalFunctions::JSBuiltinInternalFunctions(JSC::VM& v)
: vm(v)
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
, m_rtcPeerConnectionInternalsFunctions(vm)
#endif
#if ENABLE(STREAMS_API)
@@ -53,7 +53,7 @@
void JSBuiltinInternalFunctions::visit(JSC::SlotVisitor& visitor)
{
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
m_rtcPeerConnectionInternalsFunctions.visit(visitor);
#endif
#if ENABLE(STREAMS_API)
@@ -61,14 +61,14 @@
m_streamInternalsFunctions.visit(visitor);
m_writableStreamInternalsFunctions.visit(visitor);
#endif
-#if !ENABLE(STREAMS_API) && !ENABLE(MEDIA_STREAM)
+#if !ENABLE(STREAMS_API) && !ENABLE(WEBRTC)
UNUSED_PARAM(visitor);
#endif
}
void JSBuiltinInternalFunctions::initialize(JSDOMGlobalObject& globalObject, VM& vm)
{
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
m_rtcPeerConnectionInternalsFunctions.init(globalObject);
#endif
#if ENABLE(STREAMS_API)
@@ -77,11 +77,11 @@
m_writableStreamInternalsFunctions.init(globalObject);
#endif
-#if ENABLE(STREAMS_API) || ENABLE(MEDIA_STREAM)
+#if ENABLE(STREAMS_API) || ENABLE(WEBRTC)
JSVMClientData& clientData = *static_cast<JSVMClientData*>(vm.clientData);
JSDOMGlobalObject::GlobalPropertyInfo staticGlobals[] = {
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#define DECLARE_GLOBAL_STATIC(name)\
JSDOMGlobalObject::GlobalPropertyInfo(\
clientData.builtinFunctions().rtcPeerConnectionInternalsBuiltins().name##PrivateName(), rtcPeerConnectionInternals().m_##name##Function.get() , DontDelete | ReadOnly),
@@ -109,7 +109,7 @@
globalObject.addStaticGlobals(staticGlobals, WTF_ARRAY_LENGTH(staticGlobals));
#endif
-#if !ENABLE(STREAMS_API) && !ENABLE(MEDIA_STREAM)
+#if !ENABLE(STREAMS_API) && !ENABLE(WEBRTC)
UNUSED_PARAM(globalObject);
UNUSED_PARAM(vm);
#endif
diff --git a/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h b/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h
index 9d18dec..0bc52f3 100644
--- a/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h
+++ b/Source/WebCore/bindings/js/WebCoreJSBuiltinInternals.h
@@ -29,7 +29,7 @@
#include <runtime/VM.h>
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "RTCPeerConnectionInternalsBuiltins.h"
#endif
@@ -48,7 +48,7 @@
public:
explicit JSBuiltinInternalFunctions(JSC::VM&);
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
RTCPeerConnectionInternalsBuiltinFunctions rtcPeerConnectionInternals() { return m_rtcPeerConnectionInternalsFunctions; }
#endif
#if ENABLE(STREAMS_API)
@@ -62,7 +62,7 @@
private:
JSC::VM& vm;
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
RTCPeerConnectionInternalsBuiltinFunctions m_rtcPeerConnectionInternalsFunctions;
#endif
#if ENABLE(STREAMS_API)
diff --git a/Source/WebCore/bindings/js/WebCoreJSBuiltins.h b/Source/WebCore/bindings/js/WebCoreJSBuiltins.h
index f5f1a52..4ff397b 100644
--- a/Source/WebCore/bindings/js/WebCoreJSBuiltins.h
+++ b/Source/WebCore/bindings/js/WebCoreJSBuiltins.h
@@ -68,6 +68,8 @@
#if ENABLE(MEDIA_STREAM)
, m_mediaDevicesBuiltins(&vm)
, m_navigatorUserMediaBuiltins(&vm)
+#endif
+#if ENABLE(WEBRTC)
, m_rtcPeerConnectionBuiltins(&vm)
, m_rtcPeerConnectionInternalsBuiltins(&vm)
#endif
@@ -77,7 +79,7 @@
m_streamInternalsBuiltins.exportNames();
m_writableStreamInternalsBuiltins.exportNames();
#endif
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
m_rtcPeerConnectionInternalsBuiltins.exportNames();
#endif
}
@@ -99,6 +101,8 @@
#if ENABLE(MEDIA_STREAM)
MediaDevicesBuiltinsWrapper& mediaDevicesBuiltins() { return m_mediaDevicesBuiltins; }
NavigatorUserMediaBuiltinsWrapper& navigatorUserMediaBuiltins() { return m_navigatorUserMediaBuiltins;}
+#endif
+#if ENABLE(WEBRTC)
RTCPeerConnectionBuiltinsWrapper& rtcPeerConnectionBuiltins() { return m_rtcPeerConnectionBuiltins; }
RTCPeerConnectionInternalsBuiltinsWrapper& rtcPeerConnectionInternalsBuiltins() { return m_rtcPeerConnectionInternalsBuiltins; }
#endif
@@ -123,6 +127,8 @@
#if ENABLE(MEDIA_STREAM)
MediaDevicesBuiltinsWrapper m_mediaDevicesBuiltins;
NavigatorUserMediaBuiltinsWrapper m_navigatorUserMediaBuiltins;
+#endif
+#if ENABLE(WEBRTC)
RTCPeerConnectionBuiltinsWrapper m_rtcPeerConnectionBuiltins;
RTCPeerConnectionInternalsBuiltinsWrapper m_rtcPeerConnectionInternalsBuiltins;
#endif
diff --git a/Source/WebCore/dom/EventNames.in b/Source/WebCore/dom/EventNames.in
index 37cf61a..410ac8a 100644
--- a/Source/WebCore/dom/EventNames.in
+++ b/Source/WebCore/dom/EventNames.in
@@ -35,10 +35,10 @@
OfflineAudioCompletionEvent conditional=WEB_AUDIO
MediaStreamEvent conditional=MEDIA_STREAM
MediaStreamTrackEvent conditional=MEDIA_STREAM
-RTCIceCandidateEvent conditional=MEDIA_STREAM
-RTCDataChannelEvent conditional=MEDIA_STREAM
-RTCDTMFToneChangeEvent conditional=MEDIA_STREAM
-RTCTrackEvent conditional=MEDIA_STREAM
+RTCIceCandidateEvent conditional=WEB_RTC
+RTCDataChannelEvent conditional=WEB_RTC
+RTCDTMFToneChangeEvent conditional=WEB_RTC
+RTCTrackEvent conditional=WEB_RTC
SpeechSynthesisEvent conditional=SPEECH_SYNTHESIS
WebGLContextEvent conditional=WEBGL
StorageEvent
diff --git a/Source/WebCore/dom/EventTargetFactory.in b/Source/WebCore/dom/EventTargetFactory.in
index 430b8b7..844943f 100644
--- a/Source/WebCore/dom/EventTargetFactory.in
+++ b/Source/WebCore/dom/EventTargetFactory.in
@@ -24,9 +24,9 @@
Node
Notification conditional=NOTIFICATIONS|LEGACY_NOTIFICATIONS
Performance conditional=WEB_TIMING
-RTCDataChannel conditional=MEDIA_STREAM
-RTCDTMFSender conditional=MEDIA_STREAM
-RTCPeerConnection conditional=MEDIA_STREAM
+RTCDataChannel conditional=WEB_RTC
+RTCDTMFSender conditional=WEB_RTC
+RTCPeerConnection conditional=WEB_RTC
SourceBuffer conditional=MEDIA_SOURCE
SourceBufferList conditional=MEDIA_SOURCE
SpeechSynthesisUtterance conditional=SPEECH_SYNTHESIS
diff --git a/Source/WebCore/loader/FrameLoaderClient.h b/Source/WebCore/loader/FrameLoaderClient.h
index 36044da..571492c 100644
--- a/Source/WebCore/loader/FrameLoaderClient.h
+++ b/Source/WebCore/loader/FrameLoaderClient.h
@@ -91,7 +91,7 @@
class ResourceHandle;
class ResourceRequest;
class ResourceResponse;
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
class RTCPeerConnectionHandler;
#endif
class SecurityOrigin;
@@ -326,7 +326,7 @@
virtual void dispatchDidReconnectDOMWindowExtensionToGlobalObject(DOMWindowExtension*) { }
virtual void dispatchWillDestroyGlobalObjectForDOMWindowExtension(DOMWindowExtension*) { }
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
virtual void dispatchWillStartUsingPeerConnectionHandler(RTCPeerConnectionHandler*) { }
#endif
diff --git a/Source/WebCore/platform/mediastream/IceCandidate.h b/Source/WebCore/platform/mediastream/IceCandidate.h
index 5ac355e..74dc84c 100644
--- a/Source/WebCore/platform/mediastream/IceCandidate.h
+++ b/Source/WebCore/platform/mediastream/IceCandidate.h
@@ -31,7 +31,7 @@
#ifndef IceCandidate_h
#define IceCandidate_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
@@ -112,6 +112,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // IceCandidate_h
diff --git a/Source/WebCore/platform/mediastream/MediaEndpoint.cpp b/Source/WebCore/platform/mediastream/MediaEndpoint.cpp
index 2c38660..4947938 100644
--- a/Source/WebCore/platform/mediastream/MediaEndpoint.cpp
+++ b/Source/WebCore/platform/mediastream/MediaEndpoint.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MediaEndpoint.h"
namespace WebCore {
@@ -44,4 +44,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mediastream/MediaEndpoint.h b/Source/WebCore/platform/mediastream/MediaEndpoint.h
index 612978b..c09b9ea 100644
--- a/Source/WebCore/platform/mediastream/MediaEndpoint.h
+++ b/Source/WebCore/platform/mediastream/MediaEndpoint.h
@@ -31,7 +31,7 @@
#ifndef MediaEndpoint_h
#define MediaEndpoint_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MediaEndpointConfiguration.h"
#include <wtf/text/WTFString.h>
@@ -85,6 +85,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // MediaEndpoint_h
diff --git a/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp b/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp
index a26acb1..5365571 100644
--- a/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp
+++ b/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.cpp
@@ -31,7 +31,7 @@
#include "config.h"
#include "MediaEndpointConfiguration.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
namespace WebCore {
@@ -68,4 +68,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h b/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h
index 2e032b4..e373c51 100644
--- a/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h
+++ b/Source/WebCore/platform/mediastream/MediaEndpointConfiguration.h
@@ -31,7 +31,7 @@
#ifndef MediaEndpointConfiguration_h
#define MediaEndpointConfiguration_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "URL.h"
#include <wtf/RefCounted.h>
@@ -94,6 +94,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // MediaEndpointConfiguration_h
diff --git a/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h b/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h
index cd79110..bd2b083 100644
--- a/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h
+++ b/Source/WebCore/platform/mediastream/MediaEndpointSessionConfiguration.h
@@ -31,7 +31,7 @@
#ifndef MediaEndpointSessionConfiguration_h
#define MediaEndpointSessionConfiguration_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "PeerMediaDescription.h"
#include <wtf/CryptographicallyRandomNumber.h>
@@ -82,6 +82,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // MediaEndpointSessionConfiguration_h
diff --git a/Source/WebCore/platform/mediastream/MediaPayload.h b/Source/WebCore/platform/mediastream/MediaPayload.h
index db3f8bf..6df47f8 100644
--- a/Source/WebCore/platform/mediastream/MediaPayload.h
+++ b/Source/WebCore/platform/mediastream/MediaPayload.h
@@ -31,7 +31,7 @@
#ifndef MediaPayload_h
#define MediaPayload_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/HashMap.h>
#include <wtf/RefCounted.h>
@@ -112,6 +112,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // MediaPayload_h
diff --git a/Source/WebCore/platform/mediastream/PeerMediaDescription.h b/Source/WebCore/platform/mediastream/PeerMediaDescription.h
index 1c1386d..22dc13a 100644
--- a/Source/WebCore/platform/mediastream/PeerMediaDescription.h
+++ b/Source/WebCore/platform/mediastream/PeerMediaDescription.h
@@ -31,7 +31,7 @@
#ifndef PeerMediaDescription_h
#define PeerMediaDescription_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "IceCandidate.h"
#include "MediaPayload.h"
@@ -179,6 +179,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // PeerMediaDescription_h
diff --git a/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h b/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h
index 8a1354c..9b5c8de 100644
--- a/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h
+++ b/Source/WebCore/platform/mediastream/RTCConfigurationPrivate.h
@@ -26,7 +26,7 @@
#ifndef RTCConfigurationPrivate_h
#define RTCConfigurationPrivate_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCIceServerPrivate.h"
#include <wtf/PassRefPtr.h>
@@ -75,6 +75,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCConfigurationPrivate_h
diff --git a/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h b/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h
index b96aa8f..1733cf2 100644
--- a/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h
+++ b/Source/WebCore/platform/mediastream/RTCDTMFSenderHandler.h
@@ -26,7 +26,7 @@
#ifndef RTCDTMFSenderHandler_h
#define RTCDTMFSenderHandler_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/text/WTFString.h>
@@ -48,6 +48,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDTMFSenderHandler_h
diff --git a/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h b/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h
index 17c4715..32f18e5 100644
--- a/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h
+++ b/Source/WebCore/platform/mediastream/RTCDTMFSenderHandlerClient.h
@@ -26,7 +26,7 @@
#ifndef RTCDTMFSenderHandlerClient_h
#define RTCDTMFSenderHandlerClient_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
namespace WebCore {
@@ -39,6 +39,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDTMFSenderHandlerClient_h
diff --git a/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h b/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h
index 74bd11f..522f975 100644
--- a/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h
+++ b/Source/WebCore/platform/mediastream/RTCDataChannelHandler.h
@@ -25,7 +25,7 @@
#ifndef RTCDataChannelHandler_h
#define RTCDataChannelHandler_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/text/WTFString.h>
@@ -55,6 +55,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDataChannelHandler_h
diff --git a/Source/WebCore/platform/mediastream/RTCDataChannelHandlerClient.h b/Source/WebCore/platform/mediastream/RTCDataChannelHandlerClient.h
index 288ee16..73e86c3 100644
--- a/Source/WebCore/platform/mediastream/RTCDataChannelHandlerClient.h
+++ b/Source/WebCore/platform/mediastream/RTCDataChannelHandlerClient.h
@@ -25,7 +25,7 @@
#ifndef RTCDataChannelHandlerClient_h
#define RTCDataChannelHandlerClient_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/text/WTFString.h>
@@ -50,6 +50,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDataChannelHandlerClient_h
diff --git a/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.cpp b/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.cpp
index 34bb4be..7f7538e 100644
--- a/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.cpp
+++ b/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCIceCandidateDescriptor.h"
@@ -54,4 +54,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h b/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h
index f5123a3..64cf7ac 100644
--- a/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h
+++ b/Source/WebCore/platform/mediastream/RTCIceCandidateDescriptor.h
@@ -31,7 +31,7 @@
#ifndef RTCIceCandidateDescriptor_h
#define RTCIceCandidateDescriptor_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -58,6 +58,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCIceCandidateDescriptor_h
diff --git a/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h b/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h
index 9bd8019..27cb9a5 100644
--- a/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h
+++ b/Source/WebCore/platform/mediastream/RTCIceServerPrivate.h
@@ -26,7 +26,7 @@
#ifndef RTCIceServerPrivate_h
#define RTCIceServerPrivate_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -62,6 +62,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCIceServerPrivate_h
diff --git a/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp b/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
index 8f36b60..0239e0b 100644
--- a/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
+++ b/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
@@ -31,7 +31,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCPeerConnectionHandler.h"
@@ -73,4 +73,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h b/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
index 7fd987f..4c2e0ee 100644
--- a/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
+++ b/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
@@ -32,7 +32,7 @@
#ifndef RTCPeerConnectionHandler_h
#define RTCPeerConnectionHandler_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MediaStreamPrivate.h"
#include <wtf/PassRefPtr.h>
@@ -101,6 +101,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCPeerConnectionHandler_h
diff --git a/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h b/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h
index e2ed35b..16b763b 100644
--- a/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h
+++ b/Source/WebCore/platform/mediastream/RTCPeerConnectionHandlerClient.h
@@ -31,7 +31,7 @@
#ifndef RTCPeerConnectionHandlerClient_h
#define RTCPeerConnectionHandlerClient_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include <wtf/PassRefPtr.h>
@@ -82,6 +82,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCPeerConnectionHandlerClient_h
diff --git a/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp b/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp
index 9178676..ac70b43 100644
--- a/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp
+++ b/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "RTCSessionDescriptionDescriptor.h"
@@ -53,4 +53,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h b/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h
index 523c27f..e72e009 100644
--- a/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h
+++ b/Source/WebCore/platform/mediastream/RTCSessionDescriptionDescriptor.h
@@ -31,7 +31,7 @@
#ifndef RTCSessionDescriptionDescriptor_h
#define RTCSessionDescriptionDescriptor_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -59,6 +59,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCSessionDescriptionDescriptor_h
diff --git a/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h b/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h
index f198e84..a912a67 100644
--- a/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h
+++ b/Source/WebCore/platform/mediastream/RTCSessionDescriptionRequest.h
@@ -31,7 +31,7 @@
#ifndef RTCSessionDescriptionRequest_h
#define RTCSessionDescriptionRequest_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -66,6 +66,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCSessionDescriptionRequest_h
diff --git a/Source/WebCore/platform/mediastream/RTCStatsRequest.h b/Source/WebCore/platform/mediastream/RTCStatsRequest.h
index b5cde74..63b5ab5 100644
--- a/Source/WebCore/platform/mediastream/RTCStatsRequest.h
+++ b/Source/WebCore/platform/mediastream/RTCStatsRequest.h
@@ -31,7 +31,7 @@
#ifndef RTCStatsRequest_h
#define RTCStatsRequest_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -58,6 +58,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCStatsRequest_h
diff --git a/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h b/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h
index 50e3869..b092d05 100644
--- a/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h
+++ b/Source/WebCore/platform/mediastream/RTCStatsResponseBase.h
@@ -25,7 +25,7 @@
#ifndef RTCStatsResponseBase_h
#define RTCStatsResponseBase_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -43,7 +43,7 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCStatsResponseBase_h
diff --git a/Source/WebCore/platform/mediastream/RTCVoidRequest.h b/Source/WebCore/platform/mediastream/RTCVoidRequest.h
index 8f64f76..4b12893 100644
--- a/Source/WebCore/platform/mediastream/RTCVoidRequest.h
+++ b/Source/WebCore/platform/mediastream/RTCVoidRequest.h
@@ -31,7 +31,7 @@
#ifndef RTCVoidRequest_h
#define RTCVoidRequest_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
@@ -53,6 +53,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // RTCVoidRequest_h
diff --git a/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp b/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp
index bcb95ab..3326fbd 100644
--- a/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp
+++ b/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "SDPProcessorScriptResource.h"
namespace WebCore {
@@ -46,4 +46,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
diff --git a/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h b/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h
index 1cdc7c9..557433b 100644
--- a/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h
+++ b/Source/WebCore/platform/mediastream/SDPProcessorScriptResource.h
@@ -31,7 +31,7 @@
#ifndef SDPProcessorScriptResource_h
#define SDPProcessorScriptResource_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include <wtf/text/WTFString.h>
@@ -45,6 +45,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // SDPProcessorScriptResource_h
diff --git a/Source/WebCore/platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp b/Source/WebCore/platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp
index ad62806..9bd2bb3 100644
--- a/Source/WebCore/platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp
+++ b/Source/WebCore/platform/mediastream/gtk/SDPProcessorScriptResourceGtk.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "SDPProcessorScriptResource.h"
#include "SDPProcessorScripts.h"
diff --git a/Source/WebCore/platform/mock/MockMediaEndpoint.cpp b/Source/WebCore/platform/mock/MockMediaEndpoint.cpp
index b1799d7..5a1bd35 100644
--- a/Source/WebCore/platform/mock/MockMediaEndpoint.cpp
+++ b/Source/WebCore/platform/mock/MockMediaEndpoint.cpp
@@ -30,7 +30,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MockMediaEndpoint.h"
#include "MediaPayload.h"
@@ -165,4 +165,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mock/MockMediaEndpoint.h b/Source/WebCore/platform/mock/MockMediaEndpoint.h
index 87389d1..ddc28e0 100644
--- a/Source/WebCore/platform/mock/MockMediaEndpoint.h
+++ b/Source/WebCore/platform/mock/MockMediaEndpoint.h
@@ -31,7 +31,7 @@
#ifndef MockMediaEndpoint_h
#define MockMediaEndpoint_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "MediaEndpoint.h"
@@ -65,6 +65,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // MockMediaEndpoint_h
diff --git a/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp b/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp
index e7d99ed..26d099e 100644
--- a/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp
+++ b/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDTMFSenderHandlerMock.h"
#include "RTCDTMFSenderHandlerClient.h"
@@ -59,4 +59,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h b/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h
index a3df977..5615094 100644
--- a/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h
+++ b/Source/WebCore/platform/mock/RTCDTMFSenderHandlerMock.h
@@ -26,7 +26,7 @@
#ifndef RTCDTMFSenderHandlerMock_h
#define RTCDTMFSenderHandlerMock_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDTMFSenderHandler.h"
#include "RTCPeerConnectionHandler.h"
@@ -53,6 +53,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDataChannelHandlerMock_h
diff --git a/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.cpp b/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.cpp
index d1c5225..8ca8006 100644
--- a/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.cpp
+++ b/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDataChannelHandlerMock.h"
@@ -75,4 +75,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h b/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h
index c9faf99..8f432d5 100644
--- a/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h
+++ b/Source/WebCore/platform/mock/RTCDataChannelHandlerMock.h
@@ -26,7 +26,7 @@
#ifndef RTCDataChannelHandlerMock_h
#define RTCDataChannelHandlerMock_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDataChannelHandler.h"
#include "RTCPeerConnectionHandler.h"
@@ -68,6 +68,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCDataChannelHandlerMock_h
diff --git a/Source/WebCore/platform/mock/RTCNotifiersMock.cpp b/Source/WebCore/platform/mock/RTCNotifiersMock.cpp
index 09a2156..d667d17 100644
--- a/Source/WebCore/platform/mock/RTCNotifiersMock.cpp
+++ b/Source/WebCore/platform/mock/RTCNotifiersMock.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCNotifiersMock.h"
@@ -114,4 +114,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mock/RTCNotifiersMock.h b/Source/WebCore/platform/mock/RTCNotifiersMock.h
index 014dfb5..f3351d9 100644
--- a/Source/WebCore/platform/mock/RTCNotifiersMock.h
+++ b/Source/WebCore/platform/mock/RTCNotifiersMock.h
@@ -26,7 +26,7 @@
#ifndef RTCNotifiersMock_h
#define RTCNotifiersMock_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCDataChannelHandlerClient.h"
#include "RTCPeerConnectionHandlerClient.h"
@@ -111,6 +111,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCNotifiersMock_h
diff --git a/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp b/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp
index 307e830..5a6677b 100644
--- a/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp
+++ b/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCPeerConnectionHandlerMock.h"
@@ -177,4 +177,4 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
diff --git a/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h b/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h
index 40227b9..055238be 100644
--- a/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h
+++ b/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.h
@@ -26,7 +26,7 @@
#ifndef RTCPeerConnectionHandlerMock_h
#define RTCPeerConnectionHandlerMock_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
#include "RTCPeerConnectionHandler.h"
#include "RTCPeerConnectionHandlerClient.h"
@@ -70,6 +70,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEB_RTC)
#endif // RTCPeerConnectionHandlerMock_h
diff --git a/Source/WebCore/platform/mock/TimerEventBasedMock.h b/Source/WebCore/platform/mock/TimerEventBasedMock.h
index 407d4ee..f4c5d03 100644
--- a/Source/WebCore/platform/mock/TimerEventBasedMock.h
+++ b/Source/WebCore/platform/mock/TimerEventBasedMock.h
@@ -26,7 +26,7 @@
#ifndef TimerEventBasedMock_h
#define TimerEventBasedMock_h
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEBRTC)
#include "Timer.h"
#include <wtf/PassRefPtr.h>
@@ -85,6 +85,6 @@
} // namespace WebCore
-#endif // ENABLE(MEDIA_STREAM)
+#endif // ENABLE(WEBRTC)
#endif // TimerEventBasedMock_h
diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index 19fd8d0..57a169a 100644
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -176,8 +176,11 @@
#endif
#if ENABLE(MEDIA_STREAM)
-#include "MockMediaEndpoint.h"
#include "MockRealtimeMediaSourceCenter.h"
+#endif
+
+#if ENABLE(WEB_RTC)
+#include "MockMediaEndpoint.h"
#include "RTCPeerConnection.h"
#include "RTCPeerConnectionHandlerMock.h"
#endif
@@ -431,6 +434,9 @@
#if ENABLE(MEDIA_STREAM)
setMockMediaCaptureDevicesEnabled(true);
+#endif
+
+#if ENABLE(WEB_RTC)
enableMockMediaEndpoint();
enableMockRTCPeerConnectionHandler();
#endif
@@ -1031,7 +1037,7 @@
}
#endif
-#if ENABLE(MEDIA_STREAM)
+#if ENABLE(WEB_RTC)
void Internals::enableMockMediaEndpoint()
{
MediaEndpoint::create = MockMediaEndpoint::create;
@@ -1041,7 +1047,9 @@
{
RTCPeerConnectionHandler::create = RTCPeerConnectionHandlerMock::create;
}
+#endif
+#if ENABLE(MEDIA_STREAM)
void Internals::setMockMediaCaptureDevicesEnabled(bool enabled)
{
WebCore::Settings::setMockCaptureDevicesEnabled(enabled);
diff --git a/Source/WebCore/testing/Internals.h b/Source/WebCore/testing/Internals.h
index bb706ff..ab9b471 100644
--- a/Source/WebCore/testing/Internals.h
+++ b/Source/WebCore/testing/Internals.h
@@ -370,9 +370,12 @@
#endif
#if ENABLE(MEDIA_STREAM)
+ void setMockMediaCaptureDevicesEnabled(bool);
+#endif
+
+#if ENABLE(WEB_RTC)
void enableMockMediaEndpoint();
void enableMockRTCPeerConnectionHandler();
- void setMockMediaCaptureDevicesEnabled(bool);
#endif
String getImageSourceURL(Element*, ExceptionCode&);
diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake
index 58b2cf3..acc5fb4 100644
--- a/Source/cmake/OptionsEfl.cmake
+++ b/Source/cmake/OptionsEfl.cmake
@@ -136,6 +136,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_TRACK PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIEW_MODE_CSS_MEDIA PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_AUDIO PUBLIC ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_RTC PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEB_TIMING PUBLIC ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL PUBLIC ON)
@@ -205,7 +206,7 @@
find_package(Eldbus ${EFL_REQUIRED_VERSION} CONFIG)
endif ()
-if (ENABLE_MEDIA_STREAM)
+if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
find_package(OpenWebRTC REQUIRED)
SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
endif ()
diff --git a/Source/cmake/OptionsGTK.cmake b/Source/cmake/OptionsGTK.cmake
index 924ac69..fdae3ca 100644
--- a/Source/cmake/OptionsGTK.cmake
+++ b/Source/cmake/OptionsGTK.cmake
@@ -264,10 +264,10 @@
endif ()
endif ()
-if (ENABLE_MEDIA_STREAM)
+if (ENABLE_MEDIA_STREAM OR ENABLE_WEB_RTC)
find_package(OpenWebRTC)
if (NOT OPENWEBRTC_FOUND)
- message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM.")
+ message(FATAL_ERROR "OpenWebRTC is needed for ENABLE_MEDIA_STREAM and ENABLE_WEB_RTC.")
endif ()
SET_AND_EXPOSE_TO_BUILD(USE_OPENWEBRTC TRUE)
endif ()
diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
index bd02fb3..fedc7ec 100644
--- a/Source/cmake/WebKitFeatures.cmake
+++ b/Source/cmake/WebKitFeatures.cmake
@@ -145,8 +145,8 @@
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CAPTURE "Toggle Media Capture support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_CONTROLS_SCRIPT "Toggle definition of media controls in Javascript" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_SOURCE "Toggle Media Source support" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STREAM "Toggle Media Stream support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STATISTICS "Toggle Media Statistics support" PRIVATE OFF)
- WEBKIT_OPTION_DEFINE(ENABLE_MEDIA_STREAM "Toggle Media Stream API support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_MEMORY_SAMPLER "Toggle Memory Sampler support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_METER_ELEMENT "Toggle Meter Tag support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_MHTML "Toggle MHTML support" PRIVATE OFF)
@@ -200,11 +200,13 @@
WEBKIT_OPTION_DEFINE(ENABLE_WEB_ANIMATIONS "Toggle Web Animations support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_AUDIO "Toggle Web Audio support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_REPLAY "Toggle Web Replay support" PRIVATE OFF)
+ WEBKIT_OPTION_DEFINE(ENABLE_WEB_RTC "Toggle WebRTC API support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_SOCKETS "Toggle Web Sockets support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(ENABLE_WEB_TIMING "Toggle Web Timing support" PRIVATE OFF)
WEBKIT_OPTION_DEFINE(ENABLE_XSLT "Toggle XSLT support" PRIVATE ON)
WEBKIT_OPTION_DEFINE(USE_SYSTEM_MALLOC "Toggle system allocator instead of WebKit's custom allocator" PRIVATE OFF)
+ WEBKIT_OPTION_DEPEND(ENABLE_WEB_RTC ENABLE_MEDIA_STREAM)
WEBKIT_OPTION_DEPEND(ENABLE_ENCRYPTED_MEDIA_V2 ENABLE_VIDEO)
WEBKIT_OPTION_DEPEND(ENABLE_DFG_JIT ENABLE_JIT)
WEBKIT_OPTION_DEPEND(ENABLE_FTL_JIT ENABLE_DFG_JIT)
