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

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

Issue 2511633002: Rename "updateICE" to "setConfiguration", everywhere except in Blink. (Closed)
Patch Set: Making sure updateIce doesn't change behavior in this CL. Created 4 years, 1 month 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 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
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(ExecutionContext*,
111 const RTCConfiguration&, 111 const RTCConfiguration&,
112 const Dictionary& mediaConstraints, 112 const Dictionary&,
113 ExceptionState&); 113 ExceptionState&);
114 114
115 // Certificate management 115 // Certificate management
116 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt 116 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt
117 static ScriptPromise generateCertificate( 117 static ScriptPromise generateCertificate(
118 ScriptState*, 118 ScriptState*,
119 const AlgorithmIdentifier& keygenAlgorithm, 119 const AlgorithmIdentifier& keygenAlgorithm,
120 ExceptionState&); 120 ExceptionState&);
121 121
122 ScriptPromise addIceCandidate(ScriptState*, 122 ScriptPromise addIceCandidate(ScriptState*,
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 254
255 bool m_stopped; 255 bool m_stopped;
256 bool m_closed; 256 bool m_closed;
257 257
258 bool m_hasDataChannels; // For RAPPOR metrics 258 bool m_hasDataChannels; // For RAPPOR metrics
259 }; 259 };
260 260
261 } // namespace blink 261 } // namespace blink
262 262
263 #endif // RTCPeerConnection_h 263 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698