Post GpuMemoryBufferVideoFramePool deletion on media thread

content/renderer/media/media_stream_video_renderer_sink.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 "content/renderer/media/media_stream_video_renderer_sink.h"
 
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 22 matching lines @@
       media_task_runner_(media_task_runner),
       weak_factory_(this) {
   if (gpu_factories &&
       gpu_factories->ShouldUseGpuMemoryBuffersForVideoFrames()) {
     gpu_memory_buffer_pool_.reset(new media::GpuMemoryBufferVideoFramePool(
         media_task_runner, worker_task_runner, gpu_factories));
   }
 }
 
 MediaStreamVideoRendererSink::~MediaStreamVideoRendererSink() {
+  if (gpu_memory_buffer_pool_) {
+    media_task_runner_->DeleteSoon(FROM_HERE,

[DaleCurtis, 2016/02/11 01:28:02]

You don't need the GetWeakPtr() method, just DeleteSoon() on media task runner
since if this class is destructed it can't post any new tasks and all
outstanding ones will have completed. You already invalidate your own internal
weakptr so no calls should come back.

[emircan, 2016/02/11 01:34:48]

I agree that this would work as well. I am reverting back to PS#2.

+                                   gpu_memory_buffer_pool_.release());
+  }
 }
 
 void MediaStreamVideoRendererSink::Start() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, STOPPED);
 
   AddToVideoTrack(
       this,
       media::BindToCurrentLoop(
           base::Bind(
@@ skipping 53 matching lines @@
 
   if (!gpu_memory_buffer_pool_) {
     FrameReady(frame);
     return;
   }
 
   media_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &media::GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame,
-          base::Unretained(gpu_memory_buffer_pool_.get()), frame,
+          gpu_memory_buffer_pool_->GetWeakPtr(), frame,
           media::BindToCurrentLoop(
               base::Bind(&MediaStreamVideoRendererSink::FrameReady,
                          weak_factory_.GetWeakPtr()))));
 }
 
 void MediaStreamVideoRendererSink::FrameReady(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(frame);
 
@@ skipping 14 matching lines @@
   scoped_refptr<media::VideoFrame> video_frame =
       media::VideoFrame::CreateBlackFrame(frame_size_);
   video_frame->metadata()->SetBoolean(media::VideoFrameMetadata::END_OF_STREAM,
                                       true);
   video_frame->metadata()->SetTimeTicks(
       media::VideoFrameMetadata::REFERENCE_TIME, base::TimeTicks::Now());
   OnVideoFrame(video_frame, base::TimeTicks());
 }
 
 }  // namespace content