VideoCaptureImpl: check that there's still a channel in ~VideoCaptureImpl() before sending

content/renderer/media/video_capture_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_
 
 #include <stdint.h>
 
 #include <list>
@@ skipping 29 matching lines @@
 //
 // VideoCaptureImpl is an IO thread only object. See the comments in
 // video_capture_impl_manager.cc for the lifetime of this object.
 // All methods must be called on the IO thread.
 //
 // This is an internal class used by VideoCaptureImplManager only. Do not access
 // this directly.
 class CONTENT_EXPORT VideoCaptureImpl
     : public VideoCaptureMessageFilter::Delegate {
  public:
-  ~VideoCaptureImpl() override;
-
   VideoCaptureImpl(
       media::VideoCaptureSessionId session_id,
       VideoCaptureMessageFilter* filter,
       scoped_refptr<base::SingleThreadTaskRunner> io_task_runner);
+  ~VideoCaptureImpl() override;
 
   // Stop/resume delivering video frames to clients, based on flag |suspend|.
   void SuspendCapture(bool suspend);
 
   // Start capturing using the provided parameters.
   // |client_id| must be unique to this object in the render process. It is
   // used later to stop receiving video frames.
   // |state_update_cb| will be called when state changes.
   // |deliver_frame_cb| will be called when a frame is ready.
   void StartCapture(int client_id,
@@ skipping 81 matching lines @@
                               double consumer_resource_utilization);
   void OnClientBufferFinished2(int buffer_id,
                                const scoped_refptr<ClientBuffer2>& buffer,
                                const gpu::SyncToken& release_sync_token,
                                double consumer_resource_utilization);
 
   void StopDevice();
   void RestartCapture();
   void StartCaptureInternal();
 
-  // Helpers.
+  // Tries to remove |client_id| from |clients|, returning false if not found.
   bool RemoveClient(int client_id, ClientInfoMap* clients);
 
   mojom::VideoCaptureHost* GetVideoCaptureHost();
 
   // Called (by an unknown thread) when all consumers are done with a VideoFrame
   // and its ref-count has gone to zero.  This helper function grabs the
   // RESOURCE_UTILIZATION value from the |metadata| and then runs the given
   // callback, to trampoline back to the IO thread with the values.
   static void DidFinishConsumingFrame(
       const media::VideoFrameMetadata* metadata,
@@ skipping 21 matching lines @@
   ClientBuffer2Map client_buffer2s_;
 
   ClientInfoMap clients_;
   ClientInfoMap clients_pending_on_filter_;
   ClientInfoMap clients_pending_on_restart_;
 
   // Member params_ represents the video format requested by the
   // client to this class via StartCapture().
   media::VideoCaptureParams params_;
 
-  // The device's first captured frame referecne time sent from browser process
+  // The device's first captured frame reference time sent from browser process
   // side.
   base::TimeTicks first_frame_ref_time_;
 
-  bool suspended_;
   VideoCaptureState state_;
 
   // IO message loop reference for checking correct class operation.
   const scoped_refptr<base::SingleThreadTaskRunner> io_task_runner_;
 
   // WeakPtrFactory pointing back to |this| object, for use with
   // media::VideoFrames constructed in OnBufferReceived() from buffers cached
   // in |client_buffers_|.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<VideoCaptureImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoCaptureImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_H_