Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: content/renderer/media/media_stream_video_capturer_source.h

Issue 1873293002: Report if video capturing meets output protection requirement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comments and rebased. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..6304eaba73545621cdbd5ee6b8e44d006ba77e55 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.h"
#include "content/renderer/media/media_stream_video_source.h"
namespace media {
@@ -29,12 +30,15 @@ class CONTENT_EXPORT 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;
@@ -59,6 +63,9 @@ class CONTENT_EXPORT MediaStreamVideoCapturerSource
// The source that provides video frames.
const std::unique_ptr<media::VideoCapturerSource> source_;
+ // This is used to send IPC messages to the browser process.
+ RenderFrame* const render_frame_; // Not owned.
miu 2016/05/06 18:56:22 For safety, instead of having this render_frame_ m
xjz 2016/05/06 22:08:45 Done.
+
DISALLOW_COPY_AND_ASSIGN(MediaStreamVideoCapturerSource);
};

Powered by Google App Engine
This is Rietveld 408576698