| Index: media/base/pipeline.cc
|
| diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
|
| index 42a796f07cd550220f555dd54ca9eb5f82b7da57..6e680d528a70bc64922c7d78a497aae291673e5a 100644
|
| --- a/media/base/pipeline.cc
|
| +++ b/media/base/pipeline.cc
|
| @@ -405,10 +405,14 @@ void Pipeline::DoStop(const PipelineStatusCB& done_cb) {
|
| DCHECK(task_runner_->BelongsToCurrentThread());
|
| DCHECK(!pending_callbacks_.get());
|
|
|
| + // TODO(scherkus): Enforce that Renderer is only called on a single thread,
|
| + // even for accessing media time http://crbug.com/370634
|
| + scoped_ptr<Renderer> renderer;
|
| {
|
| base::AutoLock auto_lock(lock_);
|
| - renderer_.reset();
|
| + renderer.swap(renderer_);
|
| }
|
| + renderer.reset();
|
| text_renderer_.reset();
|
|
|
| if (demuxer_) {
|
|
|