content/renderer/media/canvas_capture_handler.cc - Issue 1505013002: Create CanvasCaptureMediaStreamTrack in a regular MediaStream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/canvas_capture_handler.cc

Issue 1505013002: Create CanvasCaptureMediaStreamTrack in a regular MediaStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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

« content/public/renderer/media_stream_api.cc ('K') | « content/renderer/media/canvas_capture_handler.h ('k') | content/renderer/renderer_blink_platform_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/canvas_capture_handler.cc

diff --git a/content/renderer/media/canvas_capture_handler.cc b/content/renderer/media/canvas_capture_handler.cc

index bb26e24c20ceaef1cc112eb4a8be9d3ad861dd9e..1bb4ad285f3b4e50a03a5c7f35235bb3a0098e11 100644

--- a/content/renderer/media/canvas_capture_handler.cc

+++ b/content/renderer/media/canvas_capture_handler.cc

@@ -86,7 +86,7 @@ class CanvasCaptureHandler::CanvasCaptureHandlerDelegate {

CanvasCaptureHandler::CanvasCaptureHandler(const blink::WebSize& size,

double frame_rate,

- blink::WebMediaStream* stream)

+ blink::WebMediaStreamTrack* track)

: ask_for_new_frame_(false),

size_(size),

io_task_runner_(content::RenderThread::Get()->GetIOMessageLoopProxy()),

@@ -94,7 +94,8 @@ CanvasCaptureHandler::CanvasCaptureHandler(const blink::WebSize& size,

scoped_ptr<media::VideoCapturerSource> video_source(

new CanvasCaptureHandler::VideoCapturerSource(

weak_ptr_factory_.GetWeakPtr(), frame_rate));

- content::AddVideoTrackToMediaStream(video_source.Pass(), false, true, stream);

+ content::AddVideoCapturerSourceToVideoTrack(video_source.Pass(), false, true,

+ track);

}

CanvasCaptureHandler::~CanvasCaptureHandler() {