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

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

Issue 1373023002: RTCCertificate, RTCPeerConnection.generateCertificate (WebRTC JavaScript) added. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed jochen's comments Created 5 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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
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 "core/dom/ActiveDOMObject.h" 36 #include "core/dom/ActiveDOMObject.h"
36 #include "modules/EventTargetModules.h" 37 #include "modules/EventTargetModules.h"
37 #include "modules/mediastream/MediaStream.h" 38 #include "modules/mediastream/MediaStream.h"
38 #include "modules/mediastream/RTCIceCandidate.h" 39 #include "modules/mediastream/RTCIceCandidate.h"
39 #include "platform/AsyncMethodRunner.h" 40 #include "platform/AsyncMethodRunner.h"
40 #include "public/platform/WebMediaConstraints.h" 41 #include "public/platform/WebMediaConstraints.h"
41 #include "public/platform/WebRTCPeerConnectionHandler.h" 42 #include "public/platform/WebRTCPeerConnectionHandler.h"
42 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" 43 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
43 44
44 namespace blink { 45 namespace blink {
(...skipping 28 matching lines...) Expand all
73 void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCall back*, ExceptionState&); 74 void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCall back*, ExceptionState&);
74 RTCSessionDescription* localDescription(); 75 RTCSessionDescription* localDescription();
75 76
76 void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCal lback*, ExceptionState&); 77 void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCal lback*, ExceptionState&);
77 RTCSessionDescription* remoteDescription(); 78 RTCSessionDescription* remoteDescription();
78 79
79 String signalingState() const; 80 String signalingState() const;
80 81
81 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaCo nstraints, ExceptionState&); 82 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaCo nstraints, ExceptionState&);
82 83
84 static ScriptPromise generateCertificate(ScriptState*, const Dictionary& key genAlgorithm, ExceptionState&);
85
83 // DEPRECATED 86 // DEPRECATED
84 void addIceCandidate(RTCIceCandidate*, ExceptionState&); 87 void addIceCandidate(RTCIceCandidate*, ExceptionState&);
85 88
86 void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, Exc eptionState&); 89 void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, Exc eptionState&);
87 90
88 String iceGatheringState() const; 91 String iceGatheringState() const;
89 92
90 String iceConnectionState() const; 93 String iceConnectionState() const;
91 94
92 MediaStreamVector getLocalStreams() const; 95 MediaStreamVector getLocalStreams() const;
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner; 182 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner;
180 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; 183 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
181 184
182 bool m_stopped; 185 bool m_stopped;
183 bool m_closed; 186 bool m_closed;
184 }; 187 };
185 188
186 } // namespace blink 189 } // namespace blink
187 190
188 #endif // RTCPeerConnection_h 191 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698