Index: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp |
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp |
index 805d30b2dd5f08df19447586300b124a05fdcc52..854a5babc9d35c6b9a4521f59b7bde8c605c4088 100644 |
--- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp |
+++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp |
@@ -331,7 +331,7 @@ RTCPeerConnection* RTCPeerConnection::create(ExecutionContext* context, const Di |
return 0; |
MediaErrorState mediaErrorState; |
- WebMediaConstraints constraints = MediaConstraintsImpl::create(mediaConstraints, mediaErrorState); |
+ WebMediaConstraints constraints = MediaConstraintsImpl::create(context, mediaConstraints, mediaErrorState); |
if (mediaErrorState.hadException()) { |
mediaErrorState.raiseException(exceptionState); |
return 0; |
@@ -417,7 +417,7 @@ void RTCPeerConnection::createOffer(ExecutionContext* context, RTCSessionDescrip |
m_peerHandler->createOffer(request, offerOptions); |
} else { |
MediaErrorState mediaErrorState; |
- WebMediaConstraints constraints = MediaConstraintsImpl::create(rtcOfferOptions, mediaErrorState); |
+ WebMediaConstraints constraints = MediaConstraintsImpl::create(context, rtcOfferOptions, mediaErrorState); |
if (mediaErrorState.hadException()) { |
mediaErrorState.raiseException(exceptionState); |
return; |
@@ -450,7 +450,7 @@ void RTCPeerConnection::createAnswer(ExecutionContext* context, RTCSessionDescri |
ASSERT(successCallback); |
MediaErrorState mediaErrorState; |
- WebMediaConstraints constraints = MediaConstraintsImpl::create(mediaConstraints, mediaErrorState); |
+ WebMediaConstraints constraints = MediaConstraintsImpl::create(context, mediaConstraints, mediaErrorState); |
if (mediaErrorState.hadException()) { |
mediaErrorState.raiseException(exceptionState); |
return; |
@@ -518,7 +518,7 @@ RTCSessionDescription* RTCPeerConnection::remoteDescription() |
return RTCSessionDescription::create(webSessionDescription); |
} |
-void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState& exceptionState) |
+void RTCPeerConnection::updateIce(ExecutionContext* context, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -528,7 +528,7 @@ void RTCPeerConnection::updateIce(const Dictionary& rtcConfiguration, const Dict |
return; |
MediaErrorState mediaErrorState; |
- WebMediaConstraints constraints = MediaConstraintsImpl::create(mediaConstraints, mediaErrorState); |
+ WebMediaConstraints constraints = MediaConstraintsImpl::create(context, mediaConstraints, mediaErrorState); |
if (mediaErrorState.hadException()) { |
mediaErrorState.raiseException(exceptionState); |
return; |
@@ -696,7 +696,7 @@ String RTCPeerConnection::iceConnectionState() const |
return String(); |
} |
-void RTCPeerConnection::addStream(MediaStream* stream, const Dictionary& mediaConstraints, ExceptionState& exceptionState) |
+void RTCPeerConnection::addStream(ExecutionContext* context, MediaStream* stream, const Dictionary& mediaConstraints, ExceptionState& exceptionState) |
{ |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -710,7 +710,7 @@ void RTCPeerConnection::addStream(MediaStream* stream, const Dictionary& mediaCo |
return; |
MediaErrorState mediaErrorState; |
- WebMediaConstraints constraints = MediaConstraintsImpl::create(mediaConstraints, mediaErrorState); |
+ WebMediaConstraints constraints = MediaConstraintsImpl::create(context, mediaConstraints, mediaErrorState); |
if (mediaErrorState.hadException()) { |
mediaErrorState.raiseException(exceptionState); |
return; |