Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(334)

Side by Side Diff: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.h

Issue 2413703002: Sync RTCDataChannel and RTCPeerConnection IDL with spec (Closed)
Patch Set: rebase Created 4 years, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 ScriptPromise setRemoteDescription(ScriptState*, 100 ScriptPromise setRemoteDescription(ScriptState*,
101 const RTCSessionDescriptionInit&); 101 const RTCSessionDescriptionInit&);
102 ScriptPromise setRemoteDescription(ScriptState*, 102 ScriptPromise setRemoteDescription(ScriptState*,
103 const RTCSessionDescriptionInit&, 103 const RTCSessionDescriptionInit&,
104 VoidCallback*, 104 VoidCallback*,
105 RTCPeerConnectionErrorCallback*); 105 RTCPeerConnectionErrorCallback*);
106 RTCSessionDescription* remoteDescription(); 106 RTCSessionDescription* remoteDescription();
107 107
108 String signalingState() const; 108 String signalingState() const;
109 109
110 void updateIce(ExecutionContext*, 110 void updateIce(const Dictionary& rtcConfiguration,
111 const Dictionary& rtcConfiguration,
112 const Dictionary& mediaConstraints, 111 const Dictionary& mediaConstraints,
113 ExceptionState&); 112 ExceptionState&);
114 113
115 // Certificate management 114 // Certificate management
116 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt 115 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt
117 static ScriptPromise generateCertificate( 116 static ScriptPromise generateCertificate(
118 ScriptState*, 117 ScriptState*,
119 const AlgorithmIdentifier& keygenAlgorithm, 118 const AlgorithmIdentifier& keygenAlgorithm,
120 ExceptionState&); 119 ExceptionState&);
121 120
(...skipping 19 matching lines...) Expand all
141 const Dictionary& mediaConstraints, 140 const Dictionary& mediaConstraints,
142 ExceptionState&); 141 ExceptionState&);
143 142
144 void removeStream(MediaStream*, ExceptionState&); 143 void removeStream(MediaStream*, ExceptionState&);
145 144
146 ScriptPromise getStats(ScriptState*, 145 ScriptPromise getStats(ScriptState*,
147 RTCStatsCallback* successCallback, 146 RTCStatsCallback* successCallback,
148 MediaStreamTrack* selector = nullptr); 147 MediaStreamTrack* selector = nullptr);
149 ScriptPromise getStats(ScriptState*, MediaStreamTrack* selector = nullptr); 148 ScriptPromise getStats(ScriptState*, MediaStreamTrack* selector = nullptr);
150 149
151 RTCDataChannel* createDataChannel(String label, 150 RTCDataChannel* createDataChannel(ExecutionContext*,
151 String label,
152 const Dictionary& dataChannelDict, 152 const Dictionary& dataChannelDict,
153 ExceptionState&); 153 ExceptionState&);
154 154
155 RTCDTMFSender* createDTMFSender(MediaStreamTrack*, ExceptionState&); 155 RTCDTMFSender* createDTMFSender(MediaStreamTrack*, ExceptionState&);
156 156
157 void close(ExceptionState&); 157 void close(ExceptionState&);
158 158
159 // We allow getStats after close, but not other calls or callbacks. 159 // We allow getStats after close, but not other calls or callbacks.
160 bool shouldFireDefaultCallbacks() { return !m_closed && !m_stopped; } 160 bool shouldFireDefaultCallbacks() { return !m_closed && !m_stopped; }
161 bool shouldFireGetStatsCallback() { return !m_stopped; } 161 bool shouldFireGetStatsCallback() { return !m_stopped; }
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 253
254 bool m_stopped; 254 bool m_stopped;
255 bool m_closed; 255 bool m_closed;
256 256
257 bool m_hasDataChannels; // For RAPPOR metrics 257 bool m_hasDataChannels; // For RAPPOR metrics
258 }; 258 };
259 259
260 } // namespace blink 260 } // namespace blink
261 261
262 #endif // RTCPeerConnection_h 262 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698