| Index: content/renderer/media/video_capture_impl_manager.h
|
| diff --git a/content/renderer/media/video_capture_impl_manager.h b/content/renderer/media/video_capture_impl_manager.h
|
| index 72f7d3985385e9f182c91edd703bedf12b1f978a..4fce3c7af05f009f212cafdb5a39fd75753a0b21 100644
|
| --- a/content/renderer/media/video_capture_impl_manager.h
|
| +++ b/content/renderer/media/video_capture_impl_manager.h
|
| @@ -2,20 +2,6 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -// TODO(hclam): This class should be renamed to VideoCaptureService.
|
| -
|
| -// This class provides access to a video capture device in the browser
|
| -// process through IPC. The main function is to deliver video frames
|
| -// to a client.
|
| -//
|
| -// THREADING
|
| -//
|
| -// VideoCaptureImplManager lives only on the render thread. All methods
|
| -// must be called on this thread.
|
| -//
|
| -// VideoFrames are delivered on the IO thread. Callbacks provided by
|
| -// a client are also called on the IO thread.
|
| -
|
| #ifndef CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_MANAGER_H_
|
| #define CONTENT_RENDERER_MEDIA_VIDEO_CAPTURE_IMPL_MANAGER_H_
|
|
|
| @@ -39,6 +25,19 @@ namespace content {
|
| class VideoCaptureImpl;
|
| class VideoCaptureMessageFilter;
|
|
|
| +// TODO(hclam): This class should be renamed to VideoCaptureService.
|
| +
|
| +// This class provides access to a video capture device in the browser
|
| +// process through IPC. The main function is to deliver video frames
|
| +// to a client.
|
| +//
|
| +// THREADING
|
| +//
|
| +// VideoCaptureImplManager lives only on the Render Main thread. All methods
|
| +// must be called on this thread.
|
| +//
|
| +// VideoFrames are delivered on the IO thread. Callbacks provided by
|
| +// a client are also called on the IO thread.
|
| class CONTENT_EXPORT VideoCaptureImplManager {
|
| public:
|
| VideoCaptureImplManager();
|
| @@ -116,8 +115,9 @@ class CONTENT_EXPORT VideoCaptureImplManager {
|
|
|
| const scoped_refptr<VideoCaptureMessageFilter> filter_;
|
|
|
| - // Bound to the render thread.
|
| - base::ThreadChecker render_main_thread_checker_;
|
| + // Hold a pointer to the Render Main message loop to check we operate on the
|
| + // right thread.
|
| + const scoped_refptr<base::MessageLoopProxy> render_main_message_loop_;
|
|
|
| // Bound to the render thread.
|
| // NOTE: Weak pointers must be invalidated before all other member variables.
|
|
|