Changeset 160553 in webkit
- Timestamp:
- Dec 13, 2013 12:04:40 PM (10 years ago)
- Location:
- trunk
- Files:
-
- 22 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r160547 r160553 1 2013-12-13 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 Adding RTCPeerConnectionErrorCallback 4 https://bugs.webkit.org/show_bug.cgi?id=125574 5 6 Reviewed by Eric Carlson. 7 8 According to the spec there should be a RTCPeerConnectionErrorCallback function type for createOffer/Answer, 9 setLocal/RemoteDescription and updateIce function calls. This callback must handle a DOMError object. 10 11 * fast/mediastream/RTCPeerConnection-createAnswer-expected.txt: 12 * fast/mediastream/RTCPeerConnection-createAnswer.html: 13 * fast/mediastream/RTCPeerConnection-createOffer-expected.txt: 14 * fast/mediastream/RTCPeerConnection-createOffer.html: 15 1 16 2013-12-13 Alexey Proskuryakov <ap@apple.com> 2 17 -
trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer-expected.txt
r160436 r160553 10 10 PASS pc.createAnswer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception. 11 11 PASS createAnswer request failed. 12 PASS errorReason.name is "IncompatibleConstraintsError" 12 13 PASS pc.createAnswer(requestSucceeded3, requestFailed3); did not throw exception. 13 14 PASS createAnswer request succeeded. -
trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createAnswer.html
r160436 r160553 40 40 { 41 41 testPassed('createAnswer request failed.'); 42 43 errorReason = reason; 44 shouldBe('errorReason.name', '"IncompatibleConstraintsError"'); 42 45 43 46 shouldNotThrow('pc.createAnswer(requestSucceeded3, requestFailed3);'); -
trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer-expected.txt
r160436 r160553 9 9 PASS pc.createOffer(requestSucceeded2, requestFailed2, {mandatory:{"succeed":false}}); did not throw exception. 10 10 PASS createOffer request failed. 11 PASS errorReason is "TEST_ERROR"11 PASS errorReason.name is "IncompatibleConstraintsError" 12 12 PASS pc.createOffer(requestSucceeded3, requestFailed1); did not throw exception. 13 13 PASS createOffer request succeeded. -
trunk/LayoutTests/fast/mediastream/RTCPeerConnection-createOffer.html
r160436 r160553 24 24 25 25 errorReason = reason; 26 shouldBe('errorReason ', '"TEST_ERROR"');26 shouldBe('errorReason.name', '"IncompatibleConstraintsError"'); 27 27 28 28 shouldNotThrow('pc.createOffer(requestSucceeded3, requestFailed1);'); -
trunk/Source/WebCore/CMakeLists.txt
r160517 r160553 212 212 Modules/mediastream/RTCDataChannel.idl 213 213 Modules/mediastream/RTCDataChannelEvent.idl 214 Modules/mediastream/RTC ErrorCallback.idl214 Modules/mediastream/RTCPeerConnectionErrorCallback.idl 215 215 Modules/mediastream/RTCIceCandidate.idl 216 216 Modules/mediastream/RTCIceCandidateEvent.idl -
trunk/Source/WebCore/ChangeLog
r160548 r160553 1 2013-12-13 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org> 2 3 Adding RTCPeerConnectionErrorCallback 4 https://bugs.webkit.org/show_bug.cgi?id=125574 5 6 Reviewed by Eric Carlson. 7 8 According to the spec there should be a RTCPeerConnectionErrorCallback function type for createOffer/Answer, 9 setLocal/RemoteDescription and updateIce function calls. This callback must handle a DOMError object. 10 11 Existing tests were updated. 12 13 * CMakeLists.txt: 14 * GNUmakefile.list.am: 15 * Modules/mediastream/RTCPeerConnection.cpp: 16 (WebCore::RTCPeerConnection::createOffer): 17 (WebCore::RTCPeerConnection::createAnswer): 18 (WebCore::RTCPeerConnection::setLocalDescription): 19 (WebCore::RTCPeerConnection::setRemoteDescription): 20 (WebCore::RTCPeerConnection::addIceCandidate): 21 * Modules/mediastream/RTCErrorCallback.h: Removed. 22 * Modules/mediastream/RTCErrorCallback.idl: Removed. 23 * Modules/mediastream/RTCPeerConnection.h: 24 * Modules/mediastream/RTCPeerConnection.idl: 25 * Modules/mediastream/RTCPeerConnectionErrorCallback.h: Added. 26 * Modules/mediastream/RTCPeerConnectionErrorCallback.idl: Added. 27 * Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp: 28 (WebCore::RTCSessionDescriptionRequestImpl::create): 29 (WebCore::RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl): 30 (WebCore::RTCSessionDescriptionRequestImpl::requestFailed): 31 * Modules/mediastream/RTCSessionDescriptionRequestImpl.h: 32 * Modules/mediastream/RTCVoidRequestImpl.cpp: 33 (WebCore::RTCVoidRequestImpl::create): 34 (WebCore::RTCVoidRequestImpl::RTCVoidRequestImpl): 35 (WebCore::RTCVoidRequestImpl::requestFailed): 36 * Modules/mediastream/RTCVoidRequestImpl.h: 37 * WebCore.xcodeproj/project.pbxproj: 38 * platform/mediastream/RTCPeerConnectionHandler.cpp: 39 (WebCore::RTCPeerConnectionHandler::incompatibleConstraintsErrorName): 40 (WebCore::RTCPeerConnectionHandler::invalidSessionDescriptionErrorName): 41 (WebCore::RTCPeerConnectionHandler::incompatibleSessionDescriptionErrorName): 42 (WebCore::RTCPeerConnectionHandler::internalErrorName): 43 * platform/mediastream/RTCPeerConnectionHandler.h: 44 * platform/mock/RTCNotifiersMock.cpp: 45 (WebCore::SessionRequestNotifier::SessionRequestNotifier): 46 (WebCore::SessionRequestNotifier::fire): 47 (WebCore::VoidRequestNotifier::VoidRequestNotifier): 48 (WebCore::VoidRequestNotifier::fire): 49 * platform/mock/RTCNotifiersMock.h: 50 * platform/mock/RTCPeerConnectionHandlerMock.cpp: 51 (WebCore::RTCPeerConnectionHandlerMock::createOffer): 52 (WebCore::RTCPeerConnectionHandlerMock::createAnswer): 53 1 54 2013-12-13 Brent Fulgham <bfulgham@apple.com> 2 55 -
trunk/Source/WebCore/DerivedSources.make
r160336 r160553 128 128 $(WebCore)/Modules/mediastream/RTCDataChannel.idl \ 129 129 $(WebCore)/Modules/mediastream/RTCDataChannelEvent.idl \ 130 $(WebCore)/Modules/mediastream/RTCErrorCallback.idl \131 130 $(WebCore)/Modules/mediastream/RTCIceCandidate.idl \ 132 131 $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \ 133 132 $(WebCore)/Modules/mediastream/RTCPeerConnection.idl \ 133 $(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \ 134 134 $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \ 135 135 $(WebCore)/Modules/mediastream/RTCSessionDescriptionCallback.idl \ -
trunk/Source/WebCore/GNUmakefile.list.am
r160517 r160553 612 612 DerivedSources/WebCore/JSRTCDataChannelEvent.cpp \ 613 613 DerivedSources/WebCore/JSRTCDataChannelEvent.h \ 614 DerivedSources/WebCore/JSRTC ErrorCallback.cpp \615 DerivedSources/WebCore/JSRTC ErrorCallback.h \614 DerivedSources/WebCore/JSRTCPeerConnectionErrorCallback.cpp \ 615 DerivedSources/WebCore/JSRTCPeerConnectionErrorCallback.h \ 616 616 DerivedSources/WebCore/JSRTCIceCandidate.cpp \ 617 617 DerivedSources/WebCore/JSRTCIceCandidate.h \ … … 1228 1228 $(WebCore)/Modules/mediastream/RTCDataChannel.idl \ 1229 1229 $(WebCore)/Modules/mediastream/RTCDataChannelEvent.idl \ 1230 $(WebCore)/Modules/mediastream/RTC ErrorCallback.idl \1230 $(WebCore)/Modules/mediastream/RTCPeerConnectionErrorCallback.idl \ 1231 1231 $(WebCore)/Modules/mediastream/RTCIceCandidate.idl \ 1232 1232 $(WebCore)/Modules/mediastream/RTCIceCandidateEvent.idl \ … … 1938 1938 Source/WebCore/Modules/mediastream/RTCDataChannelEvent.cpp \ 1939 1939 Source/WebCore/Modules/mediastream/RTCDataChannelEvent.h \ 1940 Source/WebCore/Modules/mediastream/RTC ErrorCallback.h \1940 Source/WebCore/Modules/mediastream/RTCPeerConnectionErrorCallback.h \ 1941 1941 Source/WebCore/Modules/mediastream/RTCIceCandidate.cpp \ 1942 1942 Source/WebCore/Modules/mediastream/RTCIceCandidate.h \ -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
r160181 r160553 50 50 #include "RTCDataChannelEvent.h" 51 51 #include "RTCDataChannelHandler.h" 52 #include "RTCErrorCallback.h"53 52 #include "RTCIceCandidate.h" 54 53 #include "RTCIceCandidateDescriptor.h" 55 54 #include "RTCIceCandidateEvent.h" 55 #include "RTCPeerConnectionErrorCallback.h" 56 56 #include "RTCSessionDescription.h" 57 57 #include "RTCSessionDescriptionCallback.h" … … 171 171 } 172 172 173 void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)173 void RTCPeerConnection::createOffer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec) 174 174 { 175 175 if (m_signalingState == SignalingStateClosed) { … … 191 191 } 192 192 193 void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec)193 void RTCPeerConnection::createAnswer(PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, const Dictionary& mediaConstraints, ExceptionCode& ec) 194 194 { 195 195 if (m_signalingState == SignalingStateClosed) { … … 211 211 } 212 212 213 void RTCPeerConnection::setLocalDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback, ExceptionCode& ec)213 void RTCPeerConnection::setLocalDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, ExceptionCode& ec) 214 214 { 215 215 if (m_signalingState == SignalingStateClosed) { … … 240 240 } 241 241 242 void RTCPeerConnection::setRemoteDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback, ExceptionCode& ec)242 void RTCPeerConnection::setRemoteDescription(PassRefPtr<RTCSessionDescription> prpSessionDescription, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, ExceptionCode& ec) 243 243 { 244 244 if (m_signalingState == SignalingStateClosed) { … … 289 289 } 290 290 291 void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback, ExceptionCode& ec)291 void RTCPeerConnection::addIceCandidate(RTCIceCandidate* iceCandidate, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback, ExceptionCode& ec) 292 292 { 293 293 if (m_signalingState == SignalingStateClosed) { -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
r160181 r160553 54 54 class RTCDTMFSender; 55 55 class RTCDataChannel; 56 class RTC ErrorCallback;56 class RTCPeerConnectionErrorCallback; 57 57 class RTCSessionDescription; 58 58 class RTCSessionDescriptionCallback; … … 65 65 ~RTCPeerConnection(); 66 66 67 void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTC ErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);67 void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&); 68 68 69 void createAnswer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTC ErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);69 void createAnswer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&); 70 70 71 void setLocalDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTC ErrorCallback>, ExceptionCode&);71 void setLocalDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, ExceptionCode&); 72 72 PassRefPtr<RTCSessionDescription> localDescription(ExceptionCode&); 73 73 74 void setRemoteDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTC ErrorCallback>, ExceptionCode&);74 void setRemoteDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, ExceptionCode&); 75 75 PassRefPtr<RTCSessionDescription> remoteDescription(ExceptionCode&); 76 76 … … 79 79 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&); 80 80 81 void addIceCandidate(RTCIceCandidate*, PassRefPtr<VoidCallback>, PassRefPtr<RTC ErrorCallback>, ExceptionCode&);81 void addIceCandidate(RTCIceCandidate*, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>, ExceptionCode&); 82 82 83 83 String iceGatheringState() const; -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
r159061 r160553 40 40 InterfaceName=webkitRTCPeerConnection, 41 41 ] interface RTCPeerConnection { 42 [RaisesException] void createOffer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTC ErrorCallback failureCallback, optional Dictionary mediaConstraints);42 [RaisesException] void createOffer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary mediaConstraints); 43 43 44 [RaisesException] void createAnswer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTC ErrorCallback failureCallback, optional Dictionary mediaConstraints);44 [RaisesException] void createAnswer(RTCSessionDescriptionCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback, optional Dictionary mediaConstraints); 45 45 46 [RaisesException] void setLocalDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTC ErrorCallback failureCallback);46 [RaisesException] void setLocalDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback); 47 47 [GetterRaisesException] readonly attribute RTCSessionDescription localDescription; 48 48 49 [RaisesException] void setRemoteDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTC ErrorCallback failureCallback);49 [RaisesException] void setRemoteDescription(RTCSessionDescription description, [Default=Undefined] optional VoidCallback successCallback, [Default=Undefined] optional RTCPeerConnectionErrorCallback failureCallback); 50 50 [GetterRaisesException] readonly attribute RTCSessionDescription remoteDescription; 51 51 … … 54 54 [RaisesException] void updateIce(optional Dictionary configuration, optional Dictionary mediaConstraints); 55 55 56 [RaisesException] void addIceCandidate(RTCIceCandidate candidate, VoidCallback successCallback, RTC ErrorCallback failureCallback);56 [RaisesException] void addIceCandidate(RTCIceCandidate candidate, VoidCallback successCallback, RTCPeerConnectionErrorCallback failureCallback); 57 57 58 58 readonly attribute DOMString iceGatheringState; -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionErrorCallback.h
r160552 r160553 1 1 /* 2 * Copyright (C) 201 2 Google Inc. All rights reserved.2 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without 5 5 * modification, are permitted provided that the following conditions 6 6 * are met: 7 *8 7 * 1. Redistributions of source code must retain the above copyright 9 8 * notice, this list of conditions and the following disclaimer. 10 9 * 2. Redistributions in binary form must reproduce the above copyright 11 * notice, this list of conditions and the following disclaimer 12 * in the documentation and/or other materials provided with the 13 * distribution. 14 * 3. Neither the name of Google Inc. nor the names of its contributors 15 * may be used to endorse or promote products derived from this 16 * software without specific prior written permission. 10 * notice, this list of conditions and the following disclaimer in the 11 * documentation and/or other materials provided with the distribution. 17 12 * 18 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS … … 29 24 */ 30 25 31 #ifndef RTC ErrorCallback_h32 #define RTC ErrorCallback_h26 #ifndef RTCPeerConnectionErrorCallback_h 27 #define RTCPeerConnectionErrorCallback_h 33 28 34 29 #if ENABLE(MEDIA_STREAM) 35 30 31 #include "DOMError.h" 36 32 #include <wtf/RefCounted.h> 37 #include <wtf/text/WTFString.h>38 33 39 34 namespace WebCore { 40 35 41 class RTC ErrorCallback : public RefCounted<RTCErrorCallback> {36 class RTCPeerConnectionErrorCallback : public RefCounted<RTCPeerConnectionErrorCallback> { 42 37 public: 43 virtual ~RTC ErrorCallback() { }44 virtual bool handleEvent( const String& errorInformation) = 0;38 virtual ~RTCPeerConnectionErrorCallback() { } 39 virtual bool handleEvent(DOMError*) = 0; 45 40 }; 46 41 … … 49 44 #endif // ENABLE(MEDIA_STREAM) 50 45 51 #endif // RTC ErrorCallback_h46 #endif // RTCPeerConnectionErrorCallback_h -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnectionErrorCallback.idl
r160552 r160553 1 1 /* 2 * Copyright (C) 201 2 Google Inc. All rights reserved.2 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without 5 5 * modification, are permitted provided that the following conditions 6 6 * are met: 7 *8 7 * 1. Redistributions of source code must retain the above copyright 9 8 * notice, this list of conditions and the following disclaimer. 10 9 * 2. Redistributions in binary form must reproduce the above copyright 11 * notice, this list of conditions and the following disclaimer 12 * in the documentation and/or other materials provided with the 13 * distribution. 14 * 3. Neither the name of Google Inc. nor the names of its contributors 15 * may be used to endorse or promote products derived from this 16 * software without specific prior written permission. 10 * notice, this list of conditions and the following disclaimer in the 11 * documentation and/or other materials provided with the distribution. 17 12 * 18 13 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS … … 31 26 [ 32 27 Conditional=MEDIA_STREAM, 33 ] callback interface RTC ErrorCallback {34 boolean handleEvent(DOM String errorInformation);28 ] callback interface RTCPeerConnectionErrorCallback { 29 boolean handleEvent(DOMError error); 35 30 }; 36 31 -
trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp
r146537 r160553 1 1 /* 2 2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 35 36 #include "RTCSessionDescriptionRequestImpl.h" 36 37 37 #include "RTCErrorCallback.h"38 38 #include "RTCPeerConnection.h" 39 #include "RTCPeerConnectionErrorCallback.h" 39 40 #include "RTCSessionDescription.h" 40 41 #include "RTCSessionDescriptionCallback.h" … … 43 44 namespace WebCore { 44 45 45 PassRefPtr<RTCSessionDescriptionRequestImpl> RTCSessionDescriptionRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback)46 PassRefPtr<RTCSessionDescriptionRequestImpl> RTCSessionDescriptionRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback) 46 47 { 47 48 RefPtr<RTCSessionDescriptionRequestImpl> request = adoptRef(new RTCSessionDescriptionRequestImpl(context, successCallback, errorCallback)); … … 50 51 } 51 52 52 RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl(ScriptExecutionContext* context, PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback)53 RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl(ScriptExecutionContext* context, PassRefPtr<RTCSessionDescriptionCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback) 53 54 : ActiveDOMObject(context) 54 55 , m_successCallback(successCallback) … … 74 75 { 75 76 if (m_errorCallback) 76 m_errorCallback->handleEvent( error);77 m_errorCallback->handleEvent(DOMError::create(error).get()); 77 78 78 79 clear(); -
trunk/Source/WebCore/Modules/mediastream/RTCSessionDescriptionRequestImpl.h
r127766 r160553 1 1 /* 2 2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 39 40 namespace WebCore { 40 41 41 class RTC ErrorCallback;42 class RTCPeerConnectionErrorCallback; 42 43 class RTCPeerConnection; 43 44 class RTCSessionDescriptionCallback; … … 45 46 class RTCSessionDescriptionRequestImpl : public RTCSessionDescriptionRequest, public ActiveDOMObject { 46 47 public: 47 static PassRefPtr<RTCSessionDescriptionRequestImpl> create(ScriptExecutionContext*, PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTC ErrorCallback>);48 static PassRefPtr<RTCSessionDescriptionRequestImpl> create(ScriptExecutionContext*, PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>); 48 49 virtual ~RTCSessionDescriptionRequestImpl(); 49 50 … … 55 56 56 57 private: 57 RTCSessionDescriptionRequestImpl(ScriptExecutionContext*, PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTC ErrorCallback>);58 RTCSessionDescriptionRequestImpl(ScriptExecutionContext*, PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>); 58 59 59 60 void clear(); 60 61 61 62 RefPtr<RTCSessionDescriptionCallback> m_successCallback; 62 RefPtr<RTC ErrorCallback> m_errorCallback;63 RefPtr<RTCPeerConnectionErrorCallback> m_errorCallback; 63 64 }; 64 65 -
trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.cpp
r146537 r160553 1 1 /* 2 2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 35 36 #include "RTCVoidRequestImpl.h" 36 37 37 #include " RTCErrorCallback.h"38 #include "DOMError.h" 38 39 #include "RTCPeerConnection.h" 40 #include "RTCPeerConnectionErrorCallback.h" 39 41 #include "VoidCallback.h" 40 42 41 43 namespace WebCore { 42 44 43 PassRefPtr<RTCVoidRequestImpl> RTCVoidRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback)45 PassRefPtr<RTCVoidRequestImpl> RTCVoidRequestImpl::create(ScriptExecutionContext* context, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback) 44 46 { 45 47 RefPtr<RTCVoidRequestImpl> request = adoptRef(new RTCVoidRequestImpl(context, successCallback, errorCallback)); … … 48 50 } 49 51 50 RTCVoidRequestImpl::RTCVoidRequestImpl(ScriptExecutionContext* context, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTC ErrorCallback> errorCallback)52 RTCVoidRequestImpl::RTCVoidRequestImpl(ScriptExecutionContext* context, PassRefPtr<VoidCallback> successCallback, PassRefPtr<RTCPeerConnectionErrorCallback> errorCallback) 51 53 : ActiveDOMObject(context) 52 54 , m_successCallback(successCallback) … … 70 72 { 71 73 if (m_errorCallback.get()) 72 m_errorCallback->handleEvent( error);74 m_errorCallback->handleEvent(DOMError::create(error).get()); 73 75 74 76 clear(); -
trunk/Source/WebCore/Modules/mediastream/RTCVoidRequestImpl.h
r127766 r160553 1 1 /* 2 2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 39 40 namespace WebCore { 40 41 41 class RTC ErrorCallback;42 class RTCPeerConnectionErrorCallback; 42 43 class VoidCallback; 43 44 44 45 class RTCVoidRequestImpl : public RTCVoidRequest, public ActiveDOMObject { 45 46 public: 46 static PassRefPtr<RTCVoidRequestImpl> create(ScriptExecutionContext*, PassRefPtr<VoidCallback>, PassRefPtr<RTC ErrorCallback>);47 static PassRefPtr<RTCVoidRequestImpl> create(ScriptExecutionContext*, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>); 47 48 virtual ~RTCVoidRequestImpl(); 48 49 … … 54 55 55 56 private: 56 RTCVoidRequestImpl(ScriptExecutionContext*, PassRefPtr<VoidCallback>, PassRefPtr<RTC ErrorCallback>);57 RTCVoidRequestImpl(ScriptExecutionContext*, PassRefPtr<VoidCallback>, PassRefPtr<RTCPeerConnectionErrorCallback>); 57 58 58 59 void clear(); 59 60 60 61 RefPtr<VoidCallback> m_successCallback; 61 RefPtr<RTC ErrorCallback> m_errorCallback;62 RefPtr<RTCPeerConnectionErrorCallback> m_errorCallback; 62 63 }; 63 64 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r160520 r160553 229 229 078E092017D14D1C00420AA1 /* RTCDTMFSender.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6A17CEC32700848E51 /* RTCDTMFSender.h */; settings = {ATTRIBUTES = (Private, ); }; }; 230 230 078E092117D14D1C00420AA1 /* RTCDTMFToneChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6D17CEC32700848E51 /* RTCDTMFToneChangeEvent.h */; settings = {ATTRIBUTES = (Private, ); }; }; 231 078E092217D14D1C00420AA1 /* RTCErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B6F17CEC32700848E51 /* RTCErrorCallback.h */; settings = {ATTRIBUTES = (Private, ); }; };232 231 078E092317D14D1C00420AA1 /* RTCIceCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7217CEC32700848E51 /* RTCIceCandidate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 233 232 078E092417D14D1C00420AA1 /* RTCIceCandidateEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07221B7517CEC32700848E51 /* RTCIceCandidateEvent.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 279 278 07969DB117D14151007FF842 /* JSRTCDTMFToneChangeEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9717D14151007FF842 /* JSRTCDTMFToneChangeEvent.cpp */; }; 280 279 07969DB217D14151007FF842 /* JSRTCDTMFToneChangeEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9817D14151007FF842 /* JSRTCDTMFToneChangeEvent.h */; }; 281 07969DB317D14151007FF842 /* JSRTC ErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9917D14151007FF842 /* JSRTCErrorCallback.cpp */; };282 07969DB417D14151007FF842 /* JSRTC ErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9A17D14151007FF842 /* JSRTCErrorCallback.h */; };280 07969DB317D14151007FF842 /* JSRTCPeerConnectionErrorCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9917D14151007FF842 /* JSRTCPeerConnectionErrorCallback.cpp */; }; 281 07969DB417D14151007FF842 /* JSRTCPeerConnectionErrorCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9A17D14151007FF842 /* JSRTCPeerConnectionErrorCallback.h */; }; 283 282 07969DB517D14151007FF842 /* JSRTCIceCandidate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 07969D9B17D14151007FF842 /* JSRTCIceCandidate.cpp */; }; 284 283 07969DB617D14151007FF842 /* JSRTCIceCandidate.h in Headers */ = {isa = PBXBuildFile; fileRef = 07969D9C17D14151007FF842 /* JSRTCIceCandidate.h */; }; … … 6730 6729 07221B6D17CEC32700848E51 /* RTCDTMFToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCDTMFToneChangeEvent.h; sourceTree = "<group>"; }; 6731 6730 07221B6E17CEC32700848E51 /* RTCDTMFToneChangeEvent.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCDTMFToneChangeEvent.idl; sourceTree = "<group>"; }; 6732 07221B6F17CEC32700848E51 /* RTCErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCErrorCallback.h; sourceTree = "<group>"; };6733 07221B7017CEC32700848E51 /* RTCErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCErrorCallback.idl; sourceTree = "<group>"; };6734 6731 07221B7117CEC32700848E51 /* RTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RTCIceCandidate.cpp; sourceTree = "<group>"; }; 6735 6732 07221B7217CEC32700848E51 /* RTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCIceCandidate.h; sourceTree = "<group>"; }; … … 6865 6862 07969D9717D14151007FF842 /* JSRTCDTMFToneChangeEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCDTMFToneChangeEvent.cpp; sourceTree = "<group>"; }; 6866 6863 07969D9817D14151007FF842 /* JSRTCDTMFToneChangeEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCDTMFToneChangeEvent.h; sourceTree = "<group>"; }; 6867 07969D9917D14151007FF842 /* JSRTC ErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCErrorCallback.cpp; sourceTree = "<group>"; };6868 07969D9A17D14151007FF842 /* JSRTC ErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCErrorCallback.h; sourceTree = "<group>"; };6864 07969D9917D14151007FF842 /* JSRTCPeerConnectionErrorCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCPeerConnectionErrorCallback.cpp; sourceTree = "<group>"; }; 6865 07969D9A17D14151007FF842 /* JSRTCPeerConnectionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCPeerConnectionErrorCallback.h; sourceTree = "<group>"; }; 6869 6866 07969D9B17D14151007FF842 /* JSRTCIceCandidate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSRTCIceCandidate.cpp; sourceTree = "<group>"; }; 6870 6867 07969D9C17D14151007FF842 /* JSRTCIceCandidate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSRTCIceCandidate.h; sourceTree = "<group>"; }; … … 8312 8309 4A6E9FC613C17D570046A7F8 /* FontFeatureSettings.h */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.h; fileEncoding = 4; path = FontFeatureSettings.h; sourceTree = "<group>"; }; 8313 8310 4A8C96EA0BE69032004EEFF0 /* FrameSelectionMac.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; name = FrameSelectionMac.mm; path = mac/FrameSelectionMac.mm; sourceTree = "<group>"; }; 8311 4A9755351858ED9B00BD6D15 /* RTCPeerConnectionErrorCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RTCPeerConnectionErrorCallback.h; sourceTree = "<group>"; }; 8312 4A9755361858ED9B00BD6D15 /* RTCPeerConnectionErrorCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = RTCPeerConnectionErrorCallback.idl; sourceTree = "<group>"; }; 8314 8313 4A9CC81516BB9AC600EC645A /* CSSDefaultStyleSheets.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CSSDefaultStyleSheets.cpp; sourceTree = "<group>"; }; 8315 8314 4A9CC81616BB9AC600EC645A /* CSSDefaultStyleSheets.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CSSDefaultStyleSheets.h; sourceTree = "<group>"; }; … … 13669 13668 isa = PBXGroup; 13670 13669 children = ( 13670 4A9755351858ED9B00BD6D15 /* RTCPeerConnectionErrorCallback.h */, 13671 4A9755361858ED9B00BD6D15 /* RTCPeerConnectionErrorCallback.idl */, 13671 13672 0779BF0A18453168000B6AE7 /* HTMLMediaElementMediaStream.cpp */, 13672 13673 0779BF0B18453168000B6AE7 /* HTMLMediaElementMediaStream.h */, … … 13742 13743 07221B6D17CEC32700848E51 /* RTCDTMFToneChangeEvent.h */, 13743 13744 07221B6E17CEC32700848E51 /* RTCDTMFToneChangeEvent.idl */, 13744 07221B6F17CEC32700848E51 /* RTCErrorCallback.h */,13745 07221B7017CEC32700848E51 /* RTCErrorCallback.idl */,13746 13745 07221B7117CEC32700848E51 /* RTCIceCandidate.cpp */, 13747 13746 07221B7217CEC32700848E51 /* RTCIceCandidate.h */, … … 13912 13911 07969D9717D14151007FF842 /* JSRTCDTMFToneChangeEvent.cpp */, 13913 13912 07969D9817D14151007FF842 /* JSRTCDTMFToneChangeEvent.h */, 13914 07969D9917D14151007FF842 /* JSRTC ErrorCallback.cpp */,13915 07969D9A17D14151007FF842 /* JSRTC ErrorCallback.h */,13913 07969D9917D14151007FF842 /* JSRTCPeerConnectionErrorCallback.cpp */, 13914 07969D9A17D14151007FF842 /* JSRTCPeerConnectionErrorCallback.h */, 13916 13915 07969D9B17D14151007FF842 /* JSRTCIceCandidate.cpp */, 13917 13916 07969D9C17D14151007FF842 /* JSRTCIceCandidate.h */, … … 23264 23263 A871DE270A152AC800B12A68 /* HTMLHtmlElement.h in Headers */, 23265 23264 A89570A016E9BD5900184E55 /* HTMLIdentifier.h in Headers */, 23266 07969DB417D14151007FF842 /* JSRTC ErrorCallback.h in Headers */,23265 07969DB417D14151007FF842 /* JSRTCPeerConnectionErrorCallback.h in Headers */, 23267 23266 A871DE2A0A152AC800B12A68 /* HTMLIFrameElement.h in Headers */, 23268 23267 A8EA7D2D0A19385500A8EF5F /* HTMLImageElement.h in Headers */, … … 23854 23853 B2FA3D950AB75A6F000E5AC4 /* JSSVGFETurbulenceElement.h in Headers */, 23855 23854 B2FA3D970AB75A6F000E5AC4 /* JSSVGFilterElement.h in Headers */, 23856 078E092217D14D1C00420AA1 /* RTCErrorCallback.h in Headers */,23857 23855 B27B28260CEF0C0700D39D54 /* JSSVGFontElement.h in Headers */, 23858 23856 A83B79050CCAFF15000B0825 /* JSSVGFontFaceElement.h in Headers */, … … 26877 26875 B6D9D27C14EAC0860090D75E /* JSFocusEvent.cpp in Sources */, 26878 26876 FDA15EAB12B03EE1003A583A /* JSGainNode.cpp in Sources */, 26879 07969DB317D14151007FF842 /* JSRTC ErrorCallback.cpp in Sources */,26877 07969DB317D14151007FF842 /* JSRTCPeerConnectionErrorCallback.cpp in Sources */, 26880 26878 FE80DA630E9C4703000D6F75 /* JSGeolocation.cpp in Sources */, 26881 26879 FE80D7AB0E9C1ED2000D6F75 /* JSGeolocationCustom.cpp in Sources */, -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
r159769 r160553 1 1 /* 2 2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 35 36 #include "RTCPeerConnectionHandler.h" 36 37 38 #include <wtf/NeverDestroyed.h> 39 37 40 namespace WebCore { 38 41 class RTCPeerConnectionHandlerClient; … … 45 48 CreatePeerConnectionHandler RTCPeerConnectionHandler::create = createHandler; 46 49 50 const AtomicString& RTCPeerConnectionHandler::incompatibleConstraintsErrorName() 51 { 52 static NeverDestroyed<AtomicString> incompatibleConstraints("IncompatibleConstraintsError", AtomicString::ConstructFromLiteral); 53 return incompatibleConstraints; 54 } 55 56 const AtomicString& RTCPeerConnectionHandler::invalidSessionDescriptionErrorName() 57 { 58 static NeverDestroyed<AtomicString> invalidSessionDescription("InvalidSessionDescriptionError", AtomicString::ConstructFromLiteral); 59 return invalidSessionDescription; 60 } 61 62 const AtomicString& RTCPeerConnectionHandler::incompatibleSessionDescriptionErrorName() 63 { 64 static NeverDestroyed<AtomicString> incompatibleSessionDescription("IncompatibleSessionDescriptionError", AtomicString::ConstructFromLiteral); 65 return incompatibleSessionDescription; 66 } 67 68 const AtomicString& RTCPeerConnectionHandler::internalErrorName() 69 { 70 static NeverDestroyed<AtomicString> internal("InternalError", AtomicString::ConstructFromLiteral); 71 return internal; 72 } 73 47 74 } // namespace WebCore 48 75 -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
r159769 r160553 1 1 /* 2 2 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2013 Nokia Corporation and/or its subsidiary(-ies). 3 4 * 4 5 * Redistribution and use in source and binary forms, with or without … … 75 76 virtual ~RTCPeerConnectionHandler() { } 76 77 78 static const AtomicString& incompatibleConstraintsErrorName(); 79 static const AtomicString& invalidSessionDescriptionErrorName(); 80 static const AtomicString& incompatibleSessionDescriptionErrorName(); 81 static const AtomicString& internalErrorName(); 82 77 83 virtual bool initialize(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) = 0; 78 84 -
trunk/Source/WebCore/platform/mock/RTCNotifiersMock.cpp
r159769 r160553 30 30 #include "RTCNotifiersMock.h" 31 31 32 #include "DOMError.h" 32 33 #include "RTCDataChannelHandlerMock.h" 33 34 #include "RTCSessionDescriptionDescriptor.h" … … 37 38 namespace WebCore { 38 39 39 SessionRequestNotifier::SessionRequestNotifier(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<RTCSessionDescriptionDescriptor> descriptor )40 SessionRequestNotifier::SessionRequestNotifier(PassRefPtr<RTCSessionDescriptionRequest> request, PassRefPtr<RTCSessionDescriptionDescriptor> descriptor, const String& errorName) 40 41 : m_request(request) 41 42 , m_descriptor(descriptor) 43 , m_errorName(errorName) 42 44 { 43 45 } … … 48 50 m_request->requestSucceeded(m_descriptor); 49 51 else 50 m_request->requestFailed( "TEST_ERROR");52 m_request->requestFailed(m_errorName); 51 53 } 52 54 53 VoidRequestNotifier::VoidRequestNotifier(PassRefPtr<RTCVoidRequest> request, bool success )55 VoidRequestNotifier::VoidRequestNotifier(PassRefPtr<RTCVoidRequest> request, bool success, const String& errorName) 54 56 : m_request(request) 55 57 , m_success(success) 58 , m_errorName(errorName) 56 59 { 57 60 } … … 62 65 m_request->requestSucceeded(); 63 66 else 64 m_request->requestFailed( "TEST_ERROR");67 m_request->requestFailed(m_errorName); 65 68 } 66 69 -
trunk/Source/WebCore/platform/mock/RTCNotifiersMock.h
r157892 r160553 34 34 #include <wtf/PassRefPtr.h> 35 35 #include <wtf/RefPtr.h> 36 #include <wtf/text/WTFString.h> 36 37 37 38 namespace WebCore { … … 43 44 class SessionRequestNotifier : public MockNotifier { 44 45 public: 45 SessionRequestNotifier(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCSessionDescriptionDescriptor> );46 SessionRequestNotifier(PassRefPtr<RTCSessionDescriptionRequest>, PassRefPtr<RTCSessionDescriptionDescriptor>, const String& = emptyString()); 46 47 47 48 void fire() OVERRIDE; … … 50 51 RefPtr<RTCSessionDescriptionRequest> m_request; 51 52 RefPtr<RTCSessionDescriptionDescriptor> m_descriptor; 53 String m_errorName; 52 54 }; 53 55 54 56 class VoidRequestNotifier : public MockNotifier { 55 57 public: 56 VoidRequestNotifier(PassRefPtr<RTCVoidRequest>, bool );58 VoidRequestNotifier(PassRefPtr<RTCVoidRequest>, bool, const String& = emptyString()); 57 59 58 60 void fire() OVERRIDE; … … 61 63 RefPtr<RTCVoidRequest> m_request; 62 64 bool m_success; 65 String m_errorName; 63 66 }; 64 67 -
trunk/Source/WebCore/platform/mock/RTCPeerConnectionHandlerMock.cpp
r160436 r160553 68 68 RefPtr<SessionRequestNotifier> notifier; 69 69 if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false") 70 notifier = adoptRef(new SessionRequestNotifier(request, 0 ));70 notifier = adoptRef(new SessionRequestNotifier(request, 0, RTCPeerConnectionHandler::incompatibleConstraintsErrorName())); 71 71 else 72 72 notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("offer", "local"))); … … 81 81 String succeedValue; 82 82 if (constraints->getMandatoryConstraintValue("succeed", succeedValue) && succeedValue == "false") 83 notifier = adoptRef(new SessionRequestNotifier(request, 0 ));83 notifier = adoptRef(new SessionRequestNotifier(request, 0, RTCPeerConnectionHandler::incompatibleConstraintsErrorName())); 84 84 else 85 85 notifier = adoptRef(new SessionRequestNotifier(request, RTCSessionDescriptionDescriptor::create("answer", "local")));
Note: See TracChangeset
for help on using the changeset viewer.