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 854a5babc9d35c6b9a4521f59b7bde8c605c4088..a259b4f2605df2fda67357ea02a52f734e0c8a71 100644 |
--- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp |
+++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp |
@@ -35,6 +35,8 @@ |
#include "bindings/core/v8/ExceptionState.h" |
#include "bindings/core/v8/Nullable.h" |
#include "bindings/core/v8/ScriptPromiseResolver.h" |
+#include "bindings/core/v8/V8ThrowException.h" |
+#include "bindings/modules/v8/UnionTypesModules.h" |
#include "bindings/modules/v8/V8RTCCertificate.h" |
#include "core/dom/Document.h" |
#include "core/dom/ExceptionCode.h" |
@@ -54,10 +56,13 @@ |
#include "modules/mediastream/RTCIceCandidateEvent.h" |
#include "modules/mediastream/RTCSessionDescription.h" |
#include "modules/mediastream/RTCSessionDescriptionCallback.h" |
+#include "modules/mediastream/RTCSessionDescriptionInit.h" |
#include "modules/mediastream/RTCSessionDescriptionRequestImpl.h" |
#include "modules/mediastream/RTCStatsCallback.h" |
#include "modules/mediastream/RTCStatsRequestImpl.h" |
#include "modules/mediastream/RTCVoidRequestImpl.h" |
+#include "modules/mediastream/RTCVoidRequestPromiseImpl.h" |
+#include "platform/Timer.h" |
#include "platform/mediastream/RTCConfiguration.h" |
#include "platform/mediastream/RTCOfferOptions.h" |
#include "public/platform/Platform.h" |
@@ -81,16 +86,106 @@ namespace blink { |
namespace { |
-static bool throwExceptionIfSignalingStateClosed(RTCPeerConnection::SignalingState state, ExceptionState& exceptionState) |
+const char kSignalingStateClosedMsg[] = "The RTCPeerConnection's signalingState is 'closed'."; |
+const char kDefaultErrorName[] = "InternalError"; |
+const char kSessionDescriptionErrorName[] = "InvalidSessionDescription"; |
+ |
+bool throwExceptionIfSignalingStateClosed(RTCPeerConnection::SignalingState state, ExceptionState& exceptionState) |
{ |
if (state == RTCPeerConnection::SignalingStateClosed) { |
- exceptionState.throwDOMException(InvalidStateError, "The RTCPeerConnection's signalingState is 'closed'."); |
+ exceptionState.throwDOMException(InvalidStateError, kSignalingStateClosedMsg); |
return true; |
} |
return false; |
} |
+class ErrorCallbackRunner final : public GarbageCollectedFinalized<ErrorCallbackRunner> { |
+ WTF_MAKE_NONCOPYABLE(ErrorCallbackRunner); |
+public: |
+ static ErrorCallbackRunner* create(RTCErrorCallback*, const String& errorMsg); |
+ ~ErrorCallbackRunner() = default; |
+ void startAsync(); |
+ |
+ DECLARE_TRACE(); |
+ |
+private: |
+ ErrorCallbackRunner(RTCErrorCallback*, const String& errorMsg); |
+ void timerFired(Timer<ErrorCallbackRunner>*); |
+ |
+ Member<RTCErrorCallback> m_errorCallback; |
+ String m_errorMsg; |
+ Timer<ErrorCallbackRunner> m_timer; |
philipj_slow
2016/02/09 18:59:17
To get the same timing as a promise rejection, wha
Guido Urdaneta
2016/02/10 07:05:13
Done. Layout test still needs fixing to verify tim
|
+}; |
+ |
+ErrorCallbackRunner* ErrorCallbackRunner::create(RTCErrorCallback* errorCallback, const String& errorMsg) |
+{ |
+ return new ErrorCallbackRunner(errorCallback, errorMsg); |
+} |
+ |
+ErrorCallbackRunner::ErrorCallbackRunner(RTCErrorCallback* errorCallback, const String& errorMsg) |
+ : m_errorCallback(errorCallback) |
+ , m_errorMsg(errorMsg) |
+ , m_timer(this, &ErrorCallbackRunner::timerFired) |
+{ |
+} |
+ |
+void ErrorCallbackRunner::startAsync() |
+{ |
+ m_timer.startOneShot(0, BLINK_FROM_HERE); |
+} |
+ |
+void ErrorCallbackRunner::timerFired(Timer<ErrorCallbackRunner>* timer) |
+{ |
+ m_errorCallback->handleEvent(m_errorMsg); |
+} |
+ |
+DEFINE_TRACE(ErrorCallbackRunner) |
+{ |
+ visitor->trace(m_errorCallback); |
+ ErrorCallbackRunner::trace(visitor); |
+} |
+ |
+void asyncCallErrorCallback(RTCErrorCallback* errorCallback, const String& errorMsg) |
+{ |
+ ErrorCallbackRunner* runner = ErrorCallbackRunner::create(errorCallback, errorMsg); |
+ runner->startAsync(); |
+} |
+ |
+bool callErrorCallbackIfSignalingStateClosed(RTCPeerConnection::SignalingState state, RTCErrorCallback* errorCallback) |
+{ |
+ if (state == RTCPeerConnection::SignalingStateClosed) { |
+ if (errorCallback) |
+ asyncCallErrorCallback(errorCallback, kSignalingStateClosedMsg); |
+ |
+ return true; |
+ } |
+ |
+ return false; |
+} |
+ |
+bool isIceCandidateMissingSdp(const RTCIceCandidateInitOrRTCIceCandidate& candidate) |
+{ |
+ if (candidate.isRTCIceCandidateInit()) { |
+ const RTCIceCandidateInit& iceCandidateInit = candidate.getAsRTCIceCandidateInit(); |
+ return !iceCandidateInit.hasSdpMid() && !iceCandidateInit.hasSdpMLineIndex(); |
+ } |
+ |
+ ASSERT(candidate.isRTCIceCandidate()); |
+ return false; |
+} |
+ |
+WebRTCICECandidate convertToWebRTCIceCandidate(const RTCIceCandidateInitOrRTCIceCandidate& candidate) |
+{ |
+ if (candidate.isRTCIceCandidateInit()) { |
+ const RTCIceCandidateInit& iceCandidateInit = candidate.getAsRTCIceCandidateInit(); |
+ return WebRTCICECandidate(iceCandidateInit.candidate(), iceCandidateInit.sdpMid(), iceCandidateInit.sdpMLineIndex()); |
+ } |
+ |
+ ASSERT(candidate.isRTCIceCandidate()); |
+ return candidate.getAsRTCIceCandidate()->webCandidate(); |
+} |
+ |
// Helper class for RTCPeerConnection::generateCertificate. |
class WebRTCCertificateObserver : public WebCallbacks<WebRTCCertificate*, void> { |
public: |
@@ -460,7 +555,19 @@ void RTCPeerConnection::createAnswer(ExecutionContext* context, RTCSessionDescri |
m_peerHandler->createAnswer(request, constraints); |
} |
-void RTCPeerConnection::setLocalDescription(ExecutionContext* context, RTCSessionDescription* sessionDescription, VoidCallback* successCallback, RTCErrorCallback* errorCallback, ExceptionState& exceptionState) |
+ScriptPromise RTCPeerConnection::setLocalDescription(ScriptState* scriptState, const RTCSessionDescriptionInit& sessionDescriptionInit) |
+{ |
+ if (m_signalingState == SignalingStateClosed) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, kSignalingStateClosedMsg)); |
+ |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ RTCVoidRequest* request = RTCVoidRequestPromiseImpl::create(this, resolver, kSessionDescriptionErrorName); |
+ m_peerHandler->setLocalDescription(request, WebRTCSessionDescription(sessionDescriptionInit.type(), sessionDescriptionInit.sdp())); |
+ return promise; |
+} |
+ |
+ScriptPromise RTCPeerConnection::setLocalDescription(ExecutionContext* context, RTCSessionDescription* sessionDescription, VoidCallback* successCallback, RTCErrorCallback* errorCallback) |
{ |
if (successCallback && errorCallback) { |
UseCounter::count(context, UseCounter::RTCPeerConnectionSetLocalDescriptionLegacyCompliant); |
@@ -471,13 +578,14 @@ void RTCPeerConnection::setLocalDescription(ExecutionContext* context, RTCSessio |
UseCounter::count(context, UseCounter::RTCPeerConnectionSetLocalDescriptionLegacyNoFailureCallback); |
} |
- if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
- return; |
+ if (callErrorCallbackIfSignalingStateClosed(m_signalingState, errorCallback)) |
+ return ScriptPromise(); |
ASSERT(sessionDescription); |
RTCVoidRequest* request = RTCVoidRequestImpl::create(executionContext(), this, successCallback, errorCallback); |
m_peerHandler->setLocalDescription(request, sessionDescription->webSessionDescription()); |
+ return ScriptPromise(); |
} |
RTCSessionDescription* RTCPeerConnection::localDescription() |
@@ -489,7 +597,19 @@ RTCSessionDescription* RTCPeerConnection::localDescription() |
return RTCSessionDescription::create(webSessionDescription); |
} |
-void RTCPeerConnection::setRemoteDescription(ExecutionContext* context, RTCSessionDescription* sessionDescription, VoidCallback* successCallback, RTCErrorCallback* errorCallback, ExceptionState& exceptionState) |
+ScriptPromise RTCPeerConnection::setRemoteDescription(ScriptState* scriptState, const RTCSessionDescriptionInit& sessionDescriptionInit) |
+{ |
+ if (m_signalingState == SignalingStateClosed) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, kSignalingStateClosedMsg)); |
+ |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ RTCVoidRequest* request = RTCVoidRequestPromiseImpl::create(this, resolver, kSessionDescriptionErrorName); |
+ m_peerHandler->setRemoteDescription(request, WebRTCSessionDescription(sessionDescriptionInit.type(), sessionDescriptionInit.sdp())); |
+ return promise; |
+} |
+ |
+ScriptPromise RTCPeerConnection::setRemoteDescription(ExecutionContext* context, RTCSessionDescription* sessionDescription, VoidCallback* successCallback, RTCErrorCallback* errorCallback) |
{ |
if (successCallback && errorCallback) { |
UseCounter::count(context, UseCounter::RTCPeerConnectionSetRemoteDescriptionLegacyCompliant); |
@@ -500,13 +620,14 @@ void RTCPeerConnection::setRemoteDescription(ExecutionContext* context, RTCSessi |
UseCounter::count(context, UseCounter::RTCPeerConnectionSetRemoteDescriptionLegacyNoFailureCallback); |
} |
- if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
- return; |
+ if (callErrorCallbackIfSignalingStateClosed(m_signalingState, errorCallback)) |
+ return ScriptPromise(); |
ASSERT(sessionDescription); |
RTCVoidRequest* request = RTCVoidRequestImpl::create(executionContext(), this, successCallback, errorCallback); |
m_peerHandler->setRemoteDescription(request, sessionDescription->webSessionDescription()); |
+ return ScriptPromise(); |
} |
RTCSessionDescription* RTCPeerConnection::remoteDescription() |
@@ -608,33 +729,41 @@ ScriptPromise RTCPeerConnection::generateCertificate(ScriptState* scriptState, c |
return promise; |
} |
-void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, ExceptionState& exceptionState) |
+ScriptPromise RTCPeerConnection::addIceCandidate(ScriptState* scriptState, const RTCIceCandidateInitOrRTCIceCandidate& candidate) |
{ |
- if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
- return; |
+ if (m_signalingState == SignalingStateClosed) |
+ return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(InvalidStateError, kSignalingStateClosedMsg)); |
- ASSERT(iceCandidate); |
+ if (isIceCandidateMissingSdp(candidate)) |
+ return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Candidate missing values for both sdpMid and sdpMLineIndex")); |
- bool valid = m_peerHandler->addICECandidate(iceCandidate->webCandidate()); |
- if (!valid) |
- exceptionState.throwDOMException(SyntaxError, "The ICE candidate could not be added."); |
+ ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState); |
+ ScriptPromise promise = resolver->promise(); |
+ RTCVoidRequest* request = RTCVoidRequestPromiseImpl::create(this, resolver, kDefaultErrorName); |
+ WebRTCICECandidate webCandidate = convertToWebRTCIceCandidate(candidate); |
+ bool implemented = m_peerHandler->addICECandidate(request, webCandidate); |
+ if (!implemented) |
+ resolver->reject(DOMException::create(NotSupportedError, "This method is not yet implemented.")); |
+ |
+ return promise; |
} |
-void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, VoidCallback* successCallback, RTCErrorCallback* errorCallback, ExceptionState& exceptionState) |
+ScriptPromise RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, VoidCallback* successCallback, RTCErrorCallback* errorCallback) |
{ |
- if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
- return; |
- |
ASSERT(iceCandidate); |
ASSERT(successCallback); |
ASSERT(errorCallback); |
- RTCVoidRequest* request = RTCVoidRequestImpl::create(executionContext(), this, successCallback, errorCallback); |
+ if (callErrorCallbackIfSignalingStateClosed(m_signalingState, errorCallback)) |
+ return ScriptPromise(); |
+ RTCVoidRequest* request = RTCVoidRequestImpl::create(executionContext(), this, successCallback, errorCallback); |
bool implemented = m_peerHandler->addICECandidate(request, iceCandidate->webCandidate()); |
if (!implemented) { |
philipj_slow
2016/02/09 18:59:17
Drop added { }?
Guido Urdaneta
2016/02/10 07:05:13
Done.
|
- exceptionState.throwDOMException(NotSupportedError, "This method is not yet implemented."); |
+ asyncCallErrorCallback(errorCallback, "This method is not yet implemented."); |
} |
+ |
+ return ScriptPromise(); |
} |
String RTCPeerConnection::signalingState() const |