Merge r104540 into 874 (m15).

content/renderer/media/audio_renderer_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/audio_renderer_impl.h"
 
 #include <math.h>
 
 #include <algorithm>
 
@@ skipping 78 matching lines @@
 
   bytes_per_second_ = params.GetBytesPerSecond();
 
   ChildProcess::current()->io_message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(this, &AudioRendererImpl::CreateStreamTask, params));
   return true;
 }
 
 void AudioRendererImpl::OnStop() {
-  base::AutoLock auto_lock(lock_);
-  if (stopped_)
-    return;
-  stopped_ = true;
+  // Since joining with the audio thread can acquire lock_, we make sure to
+  // Join() with it not under lock.
+  base::DelegateSimpleThread* audio_thread = NULL;
+  {
+    base::AutoLock auto_lock(lock_);
+    if (stopped_)
+      return;
+    stopped_ = true;
 
-  ChildProcess::current()->io_message_loop()->PostTask(
-      FROM_HERE,
-      NewRunnableMethod(this, &AudioRendererImpl::DestroyTask));
+    DCHECK_EQ(!audio_thread_.get(), !socket_.get());
+    if (socket_.get())
+      socket_->Close();
+    if (audio_thread_.get())
+      audio_thread = audio_thread_.get();
 
-  if (audio_thread_.get()) {
-    socket_->Close();
-    audio_thread_->Join();
+    ChildProcess::current()->io_message_loop()->PostTask(
+        FROM_HERE,
+        NewRunnableMethod(this, &AudioRendererImpl::DestroyTask));
   }
+
+  if (audio_thread)
+    audio_thread->Join();
 }
 
 void AudioRendererImpl::NotifyDataAvailableIfNecessary() {
   if (latency_type_ == kHighLatency) {
     // Post a task to render thread to notify a packet reception.
     ChildProcess::current()->io_message_loop()->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &AudioRendererImpl::NotifyPacketReadyTask));
   }
 }
@@ skipping 362 matching lines @@
     media::SetActualDataSizeInBytes(shared_memory_.get(),
                                     shared_memory_size_,
                                     size);
     UpdateEarliestEndTime(size, request_delay, time_now);
   }
 }
 
 void AudioRendererImpl::Send(IPC::Message* message) {
   filter_->Send(message);
 }