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

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

Issue 1418113002: RTCPeerConnection.generateCertificate taking AlgorithmIdentifier and using WebCrypto (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase with master Created 5 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 17 matching lines...) Expand all
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
29 */ 29 */
30 30
31 #ifndef RTCPeerConnection_h 31 #ifndef RTCPeerConnection_h
32 #define RTCPeerConnection_h 32 #define RTCPeerConnection_h
33 33
34 #include "bindings/core/v8/Dictionary.h" 34 #include "bindings/core/v8/Dictionary.h"
35 #include "bindings/core/v8/ScriptPromise.h" 35 #include "bindings/core/v8/ScriptPromise.h"
36 #include "core/dom/ActiveDOMObject.h" 36 #include "core/dom/ActiveDOMObject.h"
37 #include "modules/EventTargetModules.h" 37 #include "modules/EventTargetModules.h"
38 #include "modules/crypto/NormalizeAlgorithm.h"
38 #include "modules/mediastream/MediaStream.h" 39 #include "modules/mediastream/MediaStream.h"
39 #include "modules/mediastream/RTCIceCandidate.h" 40 #include "modules/mediastream/RTCIceCandidate.h"
40 #include "platform/AsyncMethodRunner.h" 41 #include "platform/AsyncMethodRunner.h"
41 #include "public/platform/WebMediaConstraints.h" 42 #include "public/platform/WebMediaConstraints.h"
42 #include "public/platform/WebRTCPeerConnectionHandler.h" 43 #include "public/platform/WebRTCPeerConnectionHandler.h"
43 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" 44 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
44 45
45 namespace blink { 46 namespace blink {
46 47
47 class ExceptionState; 48 class ExceptionState;
(...skipping 26 matching lines...) Expand all
74 void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCall back*, ExceptionState&); 75 void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCall back*, ExceptionState&);
75 RTCSessionDescription* localDescription(); 76 RTCSessionDescription* localDescription();
76 77
77 void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCal lback*, ExceptionState&); 78 void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCal lback*, ExceptionState&);
78 RTCSessionDescription* remoteDescription(); 79 RTCSessionDescription* remoteDescription();
79 80
80 String signalingState() const; 81 String signalingState() const;
81 82
82 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaCo nstraints, ExceptionState&); 83 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaCo nstraints, ExceptionState&);
83 84
84 static ScriptPromise generateCertificate(ScriptState*, const Dictionary& key genAlgorithm, ExceptionState&); 85 // Certificate management
86 // http://w3c.github.io/webrtc-pc/#sec.cert-mgmt
87 static ScriptPromise generateCertificate(ScriptState*, const AlgorithmIdenti fier& keygenAlgorithm, ExceptionState&);
85 88
86 // DEPRECATED 89 // DEPRECATED
87 void addIceCandidate(RTCIceCandidate*, ExceptionState&); 90 void addIceCandidate(RTCIceCandidate*, ExceptionState&);
88 91
89 void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, Exc eptionState&); 92 void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, Exc eptionState&);
90 93
91 String iceGatheringState() const; 94 String iceGatheringState() const;
92 95
93 String iceConnectionState() const; 96 String iceConnectionState() const;
94 97
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner; 185 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner;
183 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; 186 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
184 187
185 bool m_stopped; 188 bool m_stopped;
186 bool m_closed; 189 bool m_closed;
187 }; 190 };
188 191
189 } // namespace blink 192 } // namespace blink
190 193
191 #endif // RTCPeerConnection_h 194 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698