third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h - Issue 1729563002: Replace RTCErrorCallback with RTCPeerConnectionErrorCallback.

Unified Diff: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

Issue 1729563002: Replace RTCErrorCallback with RTCPeerConnectionErrorCallback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add missing files Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« third_party/WebKit/LayoutTests/fast/mediastream/RTCPeerConnection-localDescription.html ('K') | « third_party/WebKit/Source/modules/mediastream/RTCErrorCallback.idl ('k') | third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp » ('j') | third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

diff --git a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

index 06a9e7878d3ebece1ec0bdffc7bed1e933934cae..65242c5a9c769dd130b4ab218e87f7e662b08f24 100644

--- a/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

+++ b/third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

@@ -52,6 +52,7 @@ class RTCDataChannel;

class RTCErrorCallback;

philipj_slow 2016/02/24 08:14:03 Remove this forward declaration, grep source for a

Guido Urdaneta 2016/02/24 12:42:10 Done.

class RTCIceCandidateInitOrRTCIceCandidate;

class RTCOfferOptions;

+class RTCPeerConnectionErrorCallback;

class RTCSessionDescription;

class RTCSessionDescriptionCallback;

class RTCSessionDescriptionInit;

@@ -71,16 +72,15 @@ public:

static RTCPeerConnection* create(ExecutionContext*, const Dictionary&, const Dictionary&, ExceptionState&);

~RTCPeerConnection() override;

- void createOffer(ExecutionContext*, RTCSessionDescriptionCallback*, RTCErrorCallback*, const Dictionary&, ExceptionState&);

- void createAnswer(ExecutionContext*, RTCSessionDescriptionCallback*, RTCErrorCallback*, const Dictionary&, ExceptionState&);

+ void createOffer(ExecutionContext*, RTCSessionDescriptionCallback*, RTCPeerConnectionErrorCallback*, const Dictionary&, ExceptionState&);

+ void createAnswer(ExecutionContext*, RTCSessionDescriptionCallback*, RTCPeerConnectionErrorCallback*, const Dictionary&, ExceptionState&);

ScriptPromise setLocalDescription(ScriptState*, const RTCSessionDescriptionInit&);

- ScriptPromise setLocalDescription(ScriptState*, RTCSessionDescription*, VoidCallback*, RTCErrorCallback*);

+ ScriptPromise setLocalDescription(ScriptState*, RTCSessionDescription*, VoidCallback*, RTCPeerConnectionErrorCallback*);

RTCSessionDescription* localDescription();

ScriptPromise setRemoteDescription(ScriptState*, const RTCSessionDescriptionInit&);

- ScriptPromise setRemoteDescription(ScriptState*, RTCSessionDescription*, VoidCallback*, RTCErrorCallback*);

+ ScriptPromise setRemoteDescription(ScriptState*, RTCSessionDescription*, VoidCallback*, RTCPeerConnectionErrorCallback*);

RTCSessionDescription* remoteDescription();

String signalingState() const;

@@ -92,7 +92,7 @@ public:

static ScriptPromise generateCertificate(ScriptState*, const AlgorithmIdentifier& keygenAlgorithm, ExceptionState&);

ScriptPromise addIceCandidate(ScriptState*, const RTCIceCandidateInitOrRTCIceCandidate&);

- ScriptPromise addIceCandidate(ScriptState*, RTCIceCandidate*, VoidCallback*, RTCErrorCallback*);

+ ScriptPromise addIceCandidate(ScriptState*, RTCIceCandidate*, VoidCallback*, RTCPeerConnectionErrorCallback*);

String iceGatheringState() const;