Index: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp |
diff --git a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp |
index 79f35a22693a050135726de006be5a2fbaca6f97..21a2e7a1bb666f3ce91b1f6105c1e56d47172ddc 100644 |
--- a/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp |
+++ b/third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp |
@@ -798,10 +798,11 @@ RTCSessionDescription* RTCPeerConnection::remoteDescription() { |
return RTCSessionDescription::create(webSessionDescription); |
} |
-void RTCPeerConnection::updateIce(ExecutionContext* context, |
- const RTCConfiguration& rtcConfiguration, |
- const Dictionary& mediaConstraints, |
- ExceptionState& exceptionState) { |
+void RTCPeerConnection::setConfiguration( |
+ ExecutionContext* context, |
+ const RTCConfiguration& rtcConfiguration, |
+ const Dictionary& mediaConstraints, |
foolip
2016/11/18 08:56:05
Remove the argument name to make it obvious that i
Taylor_Brandstetter
2016/11/18 20:07:56
Done.
|
+ ExceptionState& exceptionState) { |
if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
return; |
@@ -818,12 +819,12 @@ void RTCPeerConnection::updateIce(ExecutionContext* context, |
return; |
} |
- // Constraints are ignored. |
- bool valid = m_peerHandler->updateICE(configuration); |
- if (!valid) |
+ bool valid = m_peerHandler->setConfiguration(configuration); |
+ if (!valid) { |
exceptionState.throwDOMException( |
SyntaxError, |
- "Could not update the ICE Agent with the given configuration."); |
+ "Could not update the RTCPeerConnection with the given configuration."); |
+ } |
} |
ScriptPromise RTCPeerConnection::generateCertificate( |