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

Side by Side Diff: content/renderer/media/rtc_peer_connection_handler.h

Issue 2705073003: Remove ScopedVector from content/renderer/. (Closed)
Patch Set: Rebase only Created 3 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 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 5 #ifndef CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
6 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 6 #define CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <string> 12 #include <string>
13 #include <vector>
13 14
14 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
15 #include "base/macros.h" 16 #include "base/macros.h"
16 #include "base/memory/ref_counted.h" 17 #include "base/memory/ref_counted.h"
17 #include "base/memory/weak_ptr.h" 18 #include "base/memory/weak_ptr.h"
18 #include "base/single_thread_task_runner.h" 19 #include "base/single_thread_task_runner.h"
19 #include "base/threading/thread.h" 20 #include "base/threading/thread.h"
20 #include "base/threading/thread_checker.h" 21 #include "base/threading/thread_checker.h"
21 #include "content/common/content_export.h" 22 #include "content/common/content_export.h"
22 #include "content/renderer/media/webrtc/media_stream_track_metrics.h" 23 #include "content/renderer/media/webrtc/media_stream_track_metrics.h"
(...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // After the PeerConnection has been closed, this object may no longer 243 // After the PeerConnection has been closed, this object may no longer
243 // forward callbacks to blink. 244 // forward callbacks to blink.
244 bool is_closed_; 245 bool is_closed_;
245 246
246 // |dependency_factory_| is a raw pointer, and is valid for the lifetime of 247 // |dependency_factory_| is a raw pointer, and is valid for the lifetime of
247 // RenderThreadImpl. 248 // RenderThreadImpl.
248 PeerConnectionDependencyFactory* const dependency_factory_; 249 PeerConnectionDependencyFactory* const dependency_factory_;
249 250
250 blink::WebFrame* frame_ = nullptr; 251 blink::WebFrame* frame_ = nullptr;
251 252
252 ScopedVector<WebRtcMediaStreamAdapter> local_streams_; 253 std::vector<std::unique_ptr<WebRtcMediaStreamAdapter>> local_streams_;
253 254
254 base::WeakPtr<PeerConnectionTracker> peer_connection_tracker_; 255 base::WeakPtr<PeerConnectionTracker> peer_connection_tracker_;
255 256
256 MediaStreamTrackMetrics track_metrics_; 257 MediaStreamTrackMetrics track_metrics_;
257 258
258 // Counter for a UMA stat reported at destruction time. 259 // Counter for a UMA stat reported at destruction time.
259 int num_data_channels_created_ = 0; 260 int num_data_channels_created_ = 0;
260 261
261 // Counter for number of IPv4 and IPv6 local candidates. 262 // Counter for number of IPv4 and IPv6 local candidates.
262 int num_local_candidates_ipv4_ = 0; 263 int num_local_candidates_ipv4_ = 0;
(...skipping 28 matching lines...) Expand all
291 bool ice_state_seen_[webrtc::PeerConnectionInterface::kIceConnectionMax] = {}; 292 bool ice_state_seen_[webrtc::PeerConnectionInterface::kIceConnectionMax] = {};
292 293
293 base::WeakPtrFactory<RTCPeerConnectionHandler> weak_factory_; 294 base::WeakPtrFactory<RTCPeerConnectionHandler> weak_factory_;
294 295
295 DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler); 296 DISALLOW_COPY_AND_ASSIGN(RTCPeerConnectionHandler);
296 }; 297 };
297 298
298 } // namespace content 299 } // namespace content
299 300
300 #endif // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_ 301 #endif // CONTENT_RENDERER_MEDIA_RTC_PEER_CONNECTION_HANDLER_H_
OLDNEW
« no previous file with comments | « content/renderer/media/gpu/rtc_video_encoder.cc ('k') | content/renderer/media/rtc_peer_connection_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698