Pipeline: Invalidate weak pointers before returning stop callback.

media/base/pipeline.cc

 // Copyright (c) 2012 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 "media/base/pipeline.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 182 matching lines @@
 
 void Pipeline::SetTimeDeltaInterpolatorForTesting(
     TimeDeltaInterpolator* interpolator) {
   interpolator_.reset(interpolator);
 }
 
 void Pipeline::SetErrorForTesting(PipelineStatus status) {
   OnError(status);
 }
 
+bool Pipeline::HasWeakPtrsForTesting() const {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  return weak_factory_.HasWeakPtrs();
+}
+
 void Pipeline::SetState(State next_state) {
   DVLOG(1) << GetStateString(state_) << " -> " << GetStateString(next_state);
 
   state_ = next_state;
   media_log_->AddEvent(media_log_->CreatePipelineStateChangedEvent(next_state));
 }
 
 #define RETURN_STRING(state) case state: return #state;
 
 const char* Pipeline::GetStateString(State state) {
@@ skipping 382 matching lines @@
   }
 
   StateTransitionTask(PIPELINE_OK);
 }
 
 void Pipeline::StopTask(const base::Closure& stop_cb) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(stop_cb_.is_null());
 
   if (state_ == kStopped) {
+    // Invalid all weak pointers so it's safe to destroy |this| on the render
+    // main thread.
+    weak_factory_.InvalidateWeakPtrs();
+
+    // NOTE: pipeline may be deleted at this point in time as a result of
+    // executing |stop_cb|.
     stop_cb.Run();
+
     return;
   }
 
   stop_cb_ = stop_cb;
 
   // We may already be stopping due to a runtime error.
   if (state_ == kStopping)
     return;
 
   SetState(kStopping);
@@ skipping 295 matching lines @@
 void Pipeline::StartClockIfWaitingForTimeUpdate_Locked() {
   lock_.AssertAcquired();
   if (interpolation_state_ != INTERPOLATION_WAITING_FOR_AUDIO_TIME_UPDATE)
     return;
 
   interpolation_state_ = INTERPOLATION_STARTED;
   interpolator_->StartInterpolating();
 }
 
 }  // namespace media