| Index: content/renderer/media/media_stream_video_capturer_source.h
|
| diff --git a/content/renderer/media/media_stream_video_capturer_source.h b/content/renderer/media/media_stream_video_capturer_source.h
|
| index 2d79f944b84845cd5d5ae410d6b0bd5b879c473a..68b114cfb40b5f8b09f0462a1c370f98038c6900 100644
|
| --- a/content/renderer/media/media_stream_video_capturer_source.h
|
| +++ b/content/renderer/media/media_stream_video_capturer_source.h
|
| @@ -10,6 +10,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/threading/thread_checker.h"
|
| #include "content/common/media/video_capture.h"
|
| +#include "content/public/renderer/render_frame_observer.h"
|
| #include "content/renderer/media/media_stream_video_source.h"
|
|
|
| namespace media {
|
| @@ -23,18 +24,22 @@ namespace content {
|
| // Render thread. Objects can be constructed either by indicating a |device| to
|
| // look for, or by plugging in a |source| constructed elsewhere.
|
| class CONTENT_EXPORT MediaStreamVideoCapturerSource
|
| - : public MediaStreamVideoSource {
|
| + : public MediaStreamVideoSource,
|
| + public RenderFrameObserver {
|
| public:
|
| MediaStreamVideoCapturerSource(
|
| const SourceStoppedCallback& stop_callback,
|
| std::unique_ptr<media::VideoCapturerSource> source);
|
| MediaStreamVideoCapturerSource(const SourceStoppedCallback& stop_callback,
|
| - const StreamDeviceInfo& device_info);
|
| + const StreamDeviceInfo& device_info,
|
| + RenderFrame* render_frame);
|
| ~MediaStreamVideoCapturerSource() override;
|
|
|
| // Implements MediaStreamVideoSource.
|
| void RequestRefreshFrame() override;
|
|
|
| + void SetCapturingLinkSecured(bool is_secure) override;
|
| +
|
| private:
|
| friend class CanvasCaptureHandlerTest;
|
| friend class MediaStreamVideoCapturerSourceTest;
|
|
|