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

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

Issue 2631433002: Rename RTCPeerConnection.updateIce to setConfiguration and make it work. (Closed)
Patch Set: Rebase. Created 3 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 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 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 ScriptPromise setRemoteDescription(ScriptState*, 101 ScriptPromise setRemoteDescription(ScriptState*,
102 const RTCSessionDescriptionInit&); 102 const RTCSessionDescriptionInit&);
103 ScriptPromise setRemoteDescription(ScriptState*, 103 ScriptPromise setRemoteDescription(ScriptState*,
104 const RTCSessionDescriptionInit&, 104 const RTCSessionDescriptionInit&,
105 VoidCallback*, 105 VoidCallback*,
106 RTCPeerConnectionErrorCallback*); 106 RTCPeerConnectionErrorCallback*);
107 RTCSessionDescription* remoteDescription(); 107 RTCSessionDescription* remoteDescription();
108 108
109 String signalingState() const; 109 String signalingState() const;
110 110
111 void updateIce(ExecutionContext*, 111 void setConfiguration(ExecutionContext*,
112 const RTCConfiguration&, 112 const RTCConfiguration&,
113 const Dictionary&, 113 ExceptionState&);
114 ExceptionState&);
115 114
116 // Certificate management 115 // Certificate management
117 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt 116 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt
118 static ScriptPromise generateCertificate( 117 static ScriptPromise generateCertificate(
119 ScriptState*, 118 ScriptState*,
120 const AlgorithmIdentifier& keygenAlgorithm, 119 const AlgorithmIdentifier& keygenAlgorithm,
121 ExceptionState&); 120 ExceptionState&);
122 121
123 ScriptPromise addIceCandidate(ScriptState*, 122 ScriptPromise addIceCandidate(ScriptState*,
124 const RTCIceCandidateInitOrRTCIceCandidate&); 123 const RTCIceCandidateInitOrRTCIceCandidate&);
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 254
256 bool m_stopped; 255 bool m_stopped;
257 bool m_closed; 256 bool m_closed;
258 257
259 bool m_hasDataChannels; // For RAPPOR metrics 258 bool m_hasDataChannels; // For RAPPOR metrics
260 }; 259 };
261 260
262 } // namespace blink 261 } // namespace blink
263 262
264 #endif // RTCPeerConnection_h 263 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698