Mark Layer Damaged When The Client Is Gone

cc/layers/video_frame_provider_client_impl.cc

 // Copyright 2013 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 "cc/layers/video_frame_provider_client_impl.h"
 
 #include "base/trace_event/trace_event.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/video_layer_impl.h"
 #include "media/base/video_frame.h"
@@ skipping 38 matching lines @@
 
 void VideoFrameProviderClientImpl::SetActiveVideoLayer(
     VideoLayerImpl* video_layer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(video_layer);
   active_video_layer_ = video_layer;
 }
 
 void VideoFrameProviderClientImpl::Stop() {
   DCHECK(thread_checker_.CalledOnValidThread());
+  active_video_layer_ = nullptr;
   // It's called when the main thread is blocked, so lock isn't needed.
   if (provider_) {
     provider_->SetVideoFrameProviderClient(nullptr);
     provider_ = nullptr;
   }
   if (rendering_)
     StopRendering();
-  active_video_layer_ = nullptr;
   stopped_ = true;
 }
 
 bool VideoFrameProviderClientImpl::Stopped() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return stopped_;
 }
 
 scoped_refptr<media::VideoFrame>
 VideoFrameProviderClientImpl::AcquireLockAndCurrentFrame() {
@@ skipping 43 matching lines @@
   client_->AddVideoFrameController(this);
 }
 
 void VideoFrameProviderClientImpl::StopRendering() {
   DCHECK(thread_checker_.CalledOnValidThread());
   TRACE_EVENT0("cc", "VideoFrameProviderClientImpl::StopRendering");
   DCHECK(rendering_);
   DCHECK(!stopped_);
   client_->RemoveVideoFrameController(this);
   rendering_ = false;
+  if (active_video_layer_)
+    active_video_layer_->SetNeedsRedraw();
 }
 
 void VideoFrameProviderClientImpl::DidReceiveFrame() {
   TRACE_EVENT1("cc",
                "VideoFrameProviderClientImpl::DidReceiveFrame",
                "active_video_layer",
                !!active_video_layer_);
   DCHECK(thread_checker_.CalledOnValidThread());
   needs_put_current_frame_ = true;
   if (active_video_layer_)
@@ skipping 27 matching lines @@
   DCHECK(thread_checker_.CalledOnValidThread());
   {
     base::AutoLock locker(provider_lock_);
     if (provider_ && needs_put_current_frame_)
       provider_->PutCurrentFrame();
   }
   needs_put_current_frame_ = false;
 }
 
 }  // namespace cc