Bug Fix: WebMediaPlayerMS Crashes

content/renderer/media/webmediaplayer_ms_compositor.cc

 // Copyright 2015 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/webmediaplayer_ms_compositor.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/hash.h"
@@ skipping 86 matching lines @@
     const scoped_refptr<base::SingleThreadTaskRunner>& compositor_task_runner,
     const blink::WebURL& url,
     const base::WeakPtr<WebMediaPlayerMS>& player)
     : compositor_task_runner_(compositor_task_runner),
       player_(player),
       video_frame_provider_client_(nullptr),
       current_frame_used_by_compositor_(false),
       last_render_length_(base::TimeDelta::FromSecondsD(1.0 / 60.0)),
       total_frame_count_(0),
       dropped_frame_count_(0),
-      stopped_(true) {
+      stopped_(true),
+      weak_ptr_factory_(this) {
   main_message_loop_ = base::MessageLoop::current();
 
   const blink::WebMediaStream web_stream(
       blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor(url));
   blink::WebVector<blink::WebMediaStreamTrack> video_tracks;
   if (!web_stream.isNull())
     web_stream.videoTracks(video_tracks);
 
   const bool remote_video =
       video_tracks.size() && video_tracks[0].source().remote();
@@ skipping 147 matching lines @@
 void WebMediaPlayerMSCompositor::PutCurrentFrame() {
   DVLOG(3) << __FUNCTION__;
   base::AutoLock auto_lock(current_frame_lock_);
   current_frame_used_by_compositor_ = true;
 }
 
 void WebMediaPlayerMSCompositor::StartRendering() {
   DCHECK(thread_checker_.CalledOnValidThread());
   compositor_task_runner_->PostTask(
       FROM_HERE, base::Bind(&WebMediaPlayerMSCompositor::StartRenderingInternal,
-                            base::Unretained(this)));
+                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebMediaPlayerMSCompositor::StartRenderingInternal() {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
   stopped_ = false;
 
   if (video_frame_provider_client_)
     video_frame_provider_client_->StartRendering();
 }
 
 void WebMediaPlayerMSCompositor::StopRendering() {
   DCHECK(thread_checker_.CalledOnValidThread());
   compositor_task_runner_->PostTask(
       FROM_HERE, base::Bind(&WebMediaPlayerMSCompositor::StopRenderingInternal,
-                            base::Unretained(this)));
+                            weak_ptr_factory_.GetWeakPtr()));
 }
 
 void WebMediaPlayerMSCompositor::StopRenderingInternal() {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
   stopped_ = true;
 
   // It is possible that the video gets paused and then resumed. We need to
   // reset VideoRendererAlgorithm, otherwise, VideoRendererAlgorithm will think
   // there is a very long frame in the queue and then make totally wrong
   // frame selection.
@@ skipping 82 matching lines @@
   }
 
   if (!rendering_frame_buffer_) {
     rendering_frame_buffer_.reset(new media::VideoRendererAlgorithm(
         base::Bind(&WebMediaPlayerMSCompositor::MapTimestampsToRenderTimeTicks,
                    base::Unretained(this))));
   }
 }
 
 }  // namespace content