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

Unified Diff: content/renderer/media/media_stream_video_track.cc

Issue 675013005: Split libjingle's signaling thread from the UI thread (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update tests, remove circular dependency Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/media/media_stream_track.cc ('k') | content/renderer/media/peer_connection_tracker.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/media_stream_video_track.cc
diff --git a/content/renderer/media/media_stream_video_track.cc b/content/renderer/media/media_stream_video_track.cc
index 3bde4ea6f2b3add14544d71bf20127853614b987..04d8817cca46013a0575abcd23ed21eb6e9a445e 100644
--- a/content/renderer/media/media_stream_video_track.cc
+++ b/content/renderer/media/media_stream_video_track.cc
@@ -196,7 +196,7 @@ MediaStreamVideoTrack::MediaStreamVideoTrack(
const blink::WebMediaConstraints& constraints,
const MediaStreamVideoSource::ConstraintsCallback& callback,
bool enabled)
- : MediaStreamTrack(NULL, true),
+ : MediaStreamTrack(true),
frame_deliverer_(
new MediaStreamVideoTrack::FrameDeliverer(source->io_message_loop(),
enabled)),
@@ -236,8 +236,6 @@ void MediaStreamVideoTrack::RemoveSink(MediaStreamVideoSink* sink) {
void MediaStreamVideoTrack::SetEnabled(bool enabled) {
DCHECK(thread_checker_.CalledOnValidThread());
- MediaStreamTrack::SetEnabled(enabled);
-
frame_deliverer_->SetEnabled(enabled);
for (std::vector<MediaStreamVideoSink*>::const_iterator it = sinks_.begin();
it != sinks_.end(); ++it) {
« no previous file with comments | « content/renderer/media/media_stream_track.cc ('k') | content/renderer/media/peer_connection_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698