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

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

Issue 1634073003: Remove references between RTCPeerConnection and RTCDataChannel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove RTCPeerConnection reference from RTCDataChannel Created 4 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 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 192
193 void closeInternal(); 193 void closeInternal();
194 194
195 SignalingState m_signalingState; 195 SignalingState m_signalingState;
196 ICEGatheringState m_iceGatheringState; 196 ICEGatheringState m_iceGatheringState;
197 ICEConnectionState m_iceConnectionState; 197 ICEConnectionState m_iceConnectionState;
198 198
199 MediaStreamVector m_localStreams; 199 MediaStreamVector m_localStreams;
200 MediaStreamVector m_remoteStreams; 200 MediaStreamVector m_remoteStreams;
201 201
202 HeapVector<Member<RTCDataChannel>> m_dataChannels;
203
204 OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler; 202 OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler;
205 203
206 Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner; 204 Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner;
207 HeapVector<Member<EventWrapper>> m_scheduledEvents; 205 HeapVector<Member<EventWrapper>> m_scheduledEvents;
208 206
209 bool m_stopped; 207 bool m_stopped;
210 bool m_closed; 208 bool m_closed;
211 }; 209 };
212 210
213 } // namespace blink 211 } // namespace blink
214 212
215 #endif // RTCPeerConnection_h 213 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698