diff options
| -rw-r--r-- | chrome/browser/renderer_host/audio_renderer_host.cc | 10 | ||||
| -rw-r--r-- | chrome/service/service_process.cc | 8 | ||||
| -rw-r--r-- | media/base/pipeline_impl.cc | 8 | ||||
| -rw-r--r-- | media/filters/decoder_base.h | 13 | ||||
| -rw-r--r-- | media/filters/ffmpeg_demuxer.cc | 7 | ||||
| -rw-r--r-- | media/filters/ffmpeg_video_decoder.cc | 11 | ||||
| -rw-r--r-- | media/filters/omx_video_decoder.cc | 2 | ||||
| -rw-r--r-- | remoting/host/host_key_pair.cc | 4 |
8 files changed, 41 insertions, 22 deletions
diff --git a/chrome/browser/renderer_host/audio_renderer_host.cc b/chrome/browser/renderer_host/audio_renderer_host.cc index 9493799..0b594a0 100644 --- a/chrome/browser/renderer_host/audio_renderer_host.cc +++ b/chrome/browser/renderer_host/audio_renderer_host.cc @@ -126,7 +126,7 @@ void AudioRendererHost::OnCreated(media::AudioOutputController* controller) { NewRunnableMethod( this, &AudioRendererHost::DoCompleteCreation, - controller)); + make_scoped_refptr(controller))); } void AudioRendererHost::OnPlaying(media::AudioOutputController* controller) { @@ -136,7 +136,7 @@ void AudioRendererHost::OnPlaying(media::AudioOutputController* controller) { NewRunnableMethod( this, &AudioRendererHost::DoSendPlayingMessage, - controller)); + make_scoped_refptr(controller))); } void AudioRendererHost::OnPaused(media::AudioOutputController* controller) { @@ -146,7 +146,7 @@ void AudioRendererHost::OnPaused(media::AudioOutputController* controller) { NewRunnableMethod( this, &AudioRendererHost::DoSendPausedMessage, - controller)); + make_scoped_refptr(controller))); } void AudioRendererHost::OnError(media::AudioOutputController* controller, @@ -156,7 +156,7 @@ void AudioRendererHost::OnError(media::AudioOutputController* controller, FROM_HERE, NewRunnableMethod(this, &AudioRendererHost::DoHandleError, - controller, + make_scoped_refptr(controller), error_code)); } @@ -167,7 +167,7 @@ void AudioRendererHost::OnMoreData(media::AudioOutputController* controller, FROM_HERE, NewRunnableMethod(this, &AudioRendererHost::DoRequestMoreData, - controller, + make_scoped_refptr(controller), buffers_state)); } diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index c4523e2..b4ae481 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -351,8 +351,12 @@ void ServiceProcess::SaveChromotingConfig( // And then do the update. chromoting_config_->Update( - NewRunnableFunction(&SaveChromotingConfigFunc, chromoting_config_.get(), - login, token, host_id, host_name)); + NewRunnableFunction(&SaveChromotingConfigFunc, + chromoting_config_, + login, + token, + host_id, + host_name)); // And then save the key pair. host_key_pair->Save(chromoting_config_); diff --git a/media/base/pipeline_impl.cc b/media/base/pipeline_impl.cc index bd9e9fe..5d7759c 100644 --- a/media/base/pipeline_impl.cc +++ b/media/base/pipeline_impl.cc @@ -93,8 +93,12 @@ bool PipelineImpl::Start(FilterFactory* factory, // Kick off initialization! running_ = true; - message_loop_->PostTask(FROM_HERE, - NewRunnableMethod(this, &PipelineImpl::StartTask, factory, url, + message_loop_->PostTask( + FROM_HERE, + NewRunnableMethod(this, + &PipelineImpl::StartTask, + make_scoped_refptr(factory), + url, callback.release())); return true; } diff --git a/media/filters/decoder_base.h b/media/filters/decoder_base.h index 60245ed..355bb06 100644 --- a/media/filters/decoder_base.h +++ b/media/filters/decoder_base.h @@ -30,21 +30,26 @@ class DecoderBase : public Decoder { // MediaFilter implementation. virtual void Stop(FilterCallback* callback) { - this->message_loop()->PostTask(FROM_HERE, + this->message_loop()->PostTask( + FROM_HERE, NewRunnableMethod(this, &DecoderBase::StopTask, callback)); } virtual void Seek(base::TimeDelta time, FilterCallback* callback) { - this->message_loop()->PostTask(FROM_HERE, + this->message_loop()->PostTask( + FROM_HERE, NewRunnableMethod(this, &DecoderBase::SeekTask, time, callback)); } // Decoder implementation. virtual void Initialize(DemuxerStream* demuxer_stream, FilterCallback* callback) { - this->message_loop()->PostTask(FROM_HERE, - NewRunnableMethod(this, &DecoderBase::InitializeTask, demuxer_stream, + this->message_loop()->PostTask( + FROM_HERE, + NewRunnableMethod(this, + &DecoderBase::InitializeTask, + make_scoped_refptr(demuxer_stream), callback)); } diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc index 797481b..5869e3a 100644 --- a/media/filters/ffmpeg_demuxer.cc +++ b/media/filters/ffmpeg_demuxer.cc @@ -310,8 +310,11 @@ void FFmpegDemuxer::OnAudioRendererDisabled() { void FFmpegDemuxer::Initialize(DataSource* data_source, FilterCallback* callback) { - message_loop()->PostTask(FROM_HERE, - NewRunnableMethod(this, &FFmpegDemuxer::InitializeTask, data_source, + message_loop()->PostTask( + FROM_HERE, + NewRunnableMethod(this, + &FFmpegDemuxer::InitializeTask, + make_scoped_refptr(data_source), callback)); } diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc index 4fe638f..68d2046 100644 --- a/media/filters/ffmpeg_video_decoder.cc +++ b/media/filters/ffmpeg_video_decoder.cc @@ -39,11 +39,12 @@ FFmpegVideoDecoder::~FFmpegVideoDecoder() { void FFmpegVideoDecoder::Initialize(DemuxerStream* demuxer_stream, FilterCallback* callback) { if (MessageLoop::current() != message_loop()) { - message_loop()->PostTask(FROM_HERE, - NewRunnableMethod(this, - &FFmpegVideoDecoder::Initialize, - demuxer_stream, - callback)); + message_loop()->PostTask( + FROM_HERE, + NewRunnableMethod(this, + &FFmpegVideoDecoder::Initialize, + make_scoped_refptr(demuxer_stream), + callback)); return; } diff --git a/media/filters/omx_video_decoder.cc b/media/filters/omx_video_decoder.cc index c3e4e14..eaa6169 100644 --- a/media/filters/omx_video_decoder.cc +++ b/media/filters/omx_video_decoder.cc @@ -64,7 +64,7 @@ void OmxVideoDecoder::Initialize(DemuxerStream* demuxer_stream, FROM_HERE, NewRunnableMethod(this, &OmxVideoDecoder::Initialize, - demuxer_stream, + make_scoped_refptr(demuxer_stream), callback)); return; } diff --git a/remoting/host/host_key_pair.cc b/remoting/host/host_key_pair.cc index f2ec6987..cabac20 100644 --- a/remoting/host/host_key_pair.cc +++ b/remoting/host/host_key_pair.cc @@ -55,7 +55,9 @@ void HostKeyPair::Save(MutableHostConfig* host_config) { DCHECK(key_.get() != NULL); host_config->Update( - NewRunnableMethod(this, &HostKeyPair::DoSave, host_config)); + NewRunnableMethod(this, + &HostKeyPair::DoSave, + make_scoped_refptr(host_config))); } void HostKeyPair::DoSave(MutableHostConfig* host_config) const { |