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

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

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 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 25 matching lines...) Expand all
36 #include "bindings/core/v8/ScriptPromise.h" 36 #include "bindings/core/v8/ScriptPromise.h"
37 #include "core/dom/ActiveDOMObject.h" 37 #include "core/dom/ActiveDOMObject.h"
38 #include "modules/EventTargetModules.h" 38 #include "modules/EventTargetModules.h"
39 #include "modules/crypto/NormalizeAlgorithm.h" 39 #include "modules/crypto/NormalizeAlgorithm.h"
40 #include "modules/mediastream/MediaStream.h" 40 #include "modules/mediastream/MediaStream.h"
41 #include "modules/mediastream/RTCIceCandidate.h" 41 #include "modules/mediastream/RTCIceCandidate.h"
42 #include "platform/AsyncMethodRunner.h" 42 #include "platform/AsyncMethodRunner.h"
43 #include "public/platform/WebMediaConstraints.h" 43 #include "public/platform/WebMediaConstraints.h"
44 #include "public/platform/WebRTCPeerConnectionHandler.h" 44 #include "public/platform/WebRTCPeerConnectionHandler.h"
45 #include "public/platform/WebRTCPeerConnectionHandlerClient.h" 45 #include "public/platform/WebRTCPeerConnectionHandlerClient.h"
46 #include <memory>
46 47
47 namespace blink { 48 namespace blink {
48 class ExceptionState; 49 class ExceptionState;
49 class MediaStreamTrack; 50 class MediaStreamTrack;
50 class RTCAnswerOptions; 51 class RTCAnswerOptions;
51 class RTCConfiguration; 52 class RTCConfiguration;
52 class RTCDTMFSender; 53 class RTCDTMFSender;
53 class RTCDataChannel; 54 class RTCDataChannel;
54 class RTCIceCandidateInitOrRTCIceCandidate; 55 class RTCIceCandidateInitOrRTCIceCandidate;
55 class RTCOfferOptions; 56 class RTCOfferOptions;
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 198
198 void closeInternal(); 199 void closeInternal();
199 200
200 SignalingState m_signalingState; 201 SignalingState m_signalingState;
201 ICEGatheringState m_iceGatheringState; 202 ICEGatheringState m_iceGatheringState;
202 ICEConnectionState m_iceConnectionState; 203 ICEConnectionState m_iceConnectionState;
203 204
204 MediaStreamVector m_localStreams; 205 MediaStreamVector m_localStreams;
205 MediaStreamVector m_remoteStreams; 206 MediaStreamVector m_remoteStreams;
206 207
207 OwnPtr<WebRTCPeerConnectionHandler> m_peerHandler; 208 std::unique_ptr<WebRTCPeerConnectionHandler> m_peerHandler;
208 209
209 Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner; 210 Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner;
210 HeapVector<Member<EventWrapper>> m_scheduledEvents; 211 HeapVector<Member<EventWrapper>> m_scheduledEvents;
211 212
212 bool m_stopped; 213 bool m_stopped;
213 bool m_closed; 214 bool m_closed;
214 }; 215 };
215 216
216 } // namespace blink 217 } // namespace blink
217 218
218 #endif // RTCPeerConnection_h 219 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698