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

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

Issue 1010393002: Fix issue of localDescription and remoteDescription getter. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Use SetWrapperReferenceTo. Created 5 years, 7 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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection); 64 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCPeerConnection);
65 public: 65 public:
66 static RTCPeerConnection* create(ExecutionContext*, const Dictionary&, const Dictionary&, ExceptionState&); 66 static RTCPeerConnection* create(ExecutionContext*, const Dictionary&, const Dictionary&, ExceptionState&);
67 virtual ~RTCPeerConnection(); 67 virtual ~RTCPeerConnection();
68 68
69 void createOffer(RTCSessionDescriptionCallback*, RTCErrorCallback*, const Di ctionary&, ExceptionState&); 69 void createOffer(RTCSessionDescriptionCallback*, RTCErrorCallback*, const Di ctionary&, ExceptionState&);
70 70
71 void createAnswer(RTCSessionDescriptionCallback*, RTCErrorCallback*, const D ictionary&, ExceptionState&); 71 void createAnswer(RTCSessionDescriptionCallback*, RTCErrorCallback*, const D ictionary&, ExceptionState&);
72 72
73 void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCall back*, ExceptionState&); 73 void setLocalDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCall back*, ExceptionState&);
74 RTCSessionDescription* localDescription(ExceptionState&); 74 RTCSessionDescription* localDescription();
75 75
76 void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCal lback*, ExceptionState&); 76 void setRemoteDescription(RTCSessionDescription*, VoidCallback*, RTCErrorCal lback*, ExceptionState&);
77 RTCSessionDescription* remoteDescription(ExceptionState&); 77 RTCSessionDescription* remoteDescription();
78 78
79 String signalingState() const; 79 String signalingState() const;
80 80
81 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaCo nstraints, ExceptionState&); 81 void updateIce(const Dictionary& rtcConfiguration, const Dictionary& mediaCo nstraints, ExceptionState&);
82 82
83 // DEPRECATED 83 // DEPRECATED
84 void addIceCandidate(RTCIceCandidate*, ExceptionState&); 84 void addIceCandidate(RTCIceCandidate*, ExceptionState&);
85 85
86 void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, Exc eptionState&); 86 void addIceCandidate(RTCIceCandidate*, VoidCallback*, RTCErrorCallback*, Exc eptionState&);
87 87
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>); 157 void scheduleDispatchEvent(PassRefPtrWillBeRawPtr<Event>);
158 void dispatchScheduledEvent(); 158 void dispatchScheduledEvent();
159 bool hasLocalStreamWithTrackId(const String& trackId); 159 bool hasLocalStreamWithTrackId(const String& trackId);
160 160
161 void changeSignalingState(WebRTCPeerConnectionHandlerClient::SignalingState) ; 161 void changeSignalingState(WebRTCPeerConnectionHandlerClient::SignalingState) ;
162 void changeIceGatheringState(WebRTCPeerConnectionHandlerClient::ICEGathering State); 162 void changeIceGatheringState(WebRTCPeerConnectionHandlerClient::ICEGathering State);
163 void changeIceConnectionState(WebRTCPeerConnectionHandlerClient::ICEConnecti onState); 163 void changeIceConnectionState(WebRTCPeerConnectionHandlerClient::ICEConnecti onState);
164 164
165 void closeInternal(); 165 void closeInternal();
166 166
167 Member<RTCSessionDescription> m_localDescription;
168 Member<RTCSessionDescription> m_remoteDescription;
167 SignalingState m_signalingState; 169 SignalingState m_signalingState;
168 ICEGatheringState m_iceGatheringState; 170 ICEGatheringState m_iceGatheringState;
169 ICEConnectionState m_iceConnectionState; 171 ICEConnectionState m_iceConnectionState;
170 172
171 MediaStreamVector m_localStreams; 173 MediaStreamVector m_localStreams;
172 MediaStreamVector m_remoteStreams; 174 MediaStreamVector m_remoteStreams;
173 175
174 HeapVector<Member<RTCDataChannel>> m_dataChannels; 176 HeapVector<Member<RTCDataChannel>> m_dataChannels;
175 177
176 OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler; 178 OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler;
177 179
178 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner; 180 AsyncMethodRunner<RTCPeerConnection> m_dispatchScheduledEventRunner;
179 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents; 181 WillBeHeapVector<RefPtrWillBeMember<Event>> m_scheduledEvents;
180 182
181 bool m_stopped; 183 bool m_stopped;
182 bool m_closed; 184 bool m_closed;
183 }; 185 };
184 186
185 } // namespace blink 187 } // namespace blink
186 188
187 #endif // RTCPeerConnection_h 189 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698