| Index: Source/modules/mediastream/RTCPeerConnection.h
|
| diff --git a/Source/modules/mediastream/RTCPeerConnection.h b/Source/modules/mediastream/RTCPeerConnection.h
|
| index 0f13faccc7592da2d068c0109c4a07d6a5cf6e0b..502cdb481c6115d130d84a963f432b5211599be4 100644
|
| --- a/Source/modules/mediastream/RTCPeerConnection.h
|
| +++ b/Source/modules/mediastream/RTCPeerConnection.h
|
| @@ -44,7 +44,6 @@
|
|
|
| namespace WebCore {
|
|
|
| -class ExceptionState;
|
| class MediaConstraints;
|
| class MediaStreamTrack;
|
| class RTCConfiguration;
|
| @@ -56,26 +55,28 @@ class RTCSessionDescriptionCallback;
|
| class RTCStatsCallback;
|
| class VoidCallback;
|
|
|
| +typedef int ExceptionCode;
|
| +
|
| class RTCPeerConnection : public RefCounted<RTCPeerConnection>, public ScriptWrappable, public RTCPeerConnectionHandlerClient, public EventTarget, public ActiveDOMObject {
|
| public:
|
| - static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&);
|
| + static PassRefPtr<RTCPeerConnection> create(ScriptExecutionContext*, const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
|
| ~RTCPeerConnection();
|
|
|
| - void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCErrorCallback>, const Dictionary& mediaConstraints, ExceptionState&);
|
| + void createOffer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);
|
|
|
| - void createAnswer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCErrorCallback>, const Dictionary& mediaConstraints, ExceptionState&);
|
| + void createAnswer(PassRefPtr<RTCSessionDescriptionCallback>, PassRefPtr<RTCErrorCallback>, const Dictionary& mediaConstraints, ExceptionCode&);
|
|
|
| - void setLocalDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCErrorCallback>, ExceptionState&);
|
| - PassRefPtr<RTCSessionDescription> localDescription(ExceptionState&);
|
| + void setLocalDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCErrorCallback>, ExceptionCode&);
|
| + PassRefPtr<RTCSessionDescription> localDescription(ExceptionCode&);
|
|
|
| - void setRemoteDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCErrorCallback>, ExceptionState&);
|
| - PassRefPtr<RTCSessionDescription> remoteDescription(ExceptionState&);
|
| + void setRemoteDescription(PassRefPtr<RTCSessionDescription>, PassRefPtr<VoidCallback>, PassRefPtr<RTCErrorCallback>, ExceptionCode&);
|
| + PassRefPtr<RTCSessionDescription> remoteDescription(ExceptionCode&);
|
|
|
| String signalingState() const;
|
|
|
| - void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&);
|
| + void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionCode&);
|
|
|
| - void addIceCandidate(RTCIceCandidate*, ExceptionState&);
|
| + void addIceCandidate(RTCIceCandidate*, ExceptionCode&);
|
|
|
| String iceGatheringState() const;
|
|
|
| @@ -87,17 +88,17 @@ public:
|
|
|
| MediaStream* getStreamById(const String& streamId);
|
|
|
| - void addStream(PassRefPtr<MediaStream>, const Dictionary& mediaConstraints, ExceptionState&);
|
| + void addStream(PassRefPtr<MediaStream>, const Dictionary& mediaConstraints, ExceptionCode&);
|
|
|
| - void removeStream(PassRefPtr<MediaStream>, ExceptionState&);
|
| + void removeStream(PassRefPtr<MediaStream>, ExceptionCode&);
|
|
|
| void getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector);
|
|
|
| - PassRefPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionState&);
|
| + PassRefPtr<RTCDataChannel> createDataChannel(String label, const Dictionary& dataChannelDict, ExceptionCode&);
|
|
|
| - PassRefPtr<RTCDTMFSender> createDTMFSender(PassRefPtr<MediaStreamTrack>, ExceptionState&);
|
| + PassRefPtr<RTCDTMFSender> createDTMFSender(PassRefPtr<MediaStreamTrack>, ExceptionCode&);
|
|
|
| - void close(ExceptionState&);
|
| + void close(ExceptionCode&);
|
|
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(negotiationneeded);
|
| DEFINE_ATTRIBUTE_EVENT_LISTENER(icecandidate);
|
| @@ -128,9 +129,9 @@ public:
|
| using RefCounted<RTCPeerConnection>::deref;
|
|
|
| private:
|
| - RTCPeerConnection(ScriptExecutionContext*, PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>, ExceptionState&);
|
| + RTCPeerConnection(ScriptExecutionContext*, PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>, ExceptionCode&);
|
|
|
| - static PassRefPtr<RTCConfiguration> parseConfiguration(const Dictionary& configuration, ExceptionState&);
|
| + static PassRefPtr<RTCConfiguration> parseConfiguration(const Dictionary& configuration, ExceptionCode&);
|
| void scheduleDispatchEvent(PassRefPtr<Event>);
|
| void scheduledEventTimerFired(Timer<RTCPeerConnection>*);
|
| bool hasLocalStreamWithTrackId(const String& trackId);
|
|
|