content/public/renderer/media_stream_api.cc - Issue 1543673002: MediaRecorder: make MediaRecorderHandler a MediaStreamObserver

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/public/renderer/media_stream_api.cc

Issue 1543673002: MediaRecorder: make MediaRecorderHandler a MediaStreamObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Added content_browsertests for Error Event firing when Track added/removed to MS Created 4 years, 11 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/public/renderer/media_stream_api.cc

diff --git a/content/public/renderer/media_stream_api.cc b/content/public/renderer/media_stream_api.cc

index 9ec76b703105d1ea58e20fc28bc30420289bde9d..33eb89be080ac041300533b52b1e07ed34e423d4 100644

--- a/content/public/renderer/media_stream_api.cc

+++ b/content/public/renderer/media_stream_api.cc

@@ -10,6 +10,7 @@

#include "base/callback.h"

#include "base/rand_util.h"

#include "base/strings/utf_string_conversions.h"

+#include "content/renderer/media/media_stream.h"

#include "content/renderer/media/media_stream_audio_source.h"

#include "content/renderer/media/media_stream_video_capturer_source.h"

#include "content/renderer/media/media_stream_video_track.h"

@@ -131,4 +132,9 @@ bool AddAudioTrackToMediaStream(

return true;

}

+CONTENT_EXPORT void AddMediaStreamTowebMediaStream(

+ blink::WebMediaStream* web_stream) {

+ web_stream->setExtraData(new content::MediaStream());

} // namespace content

« no previous file with comments | « content/public/renderer/media_stream_api.h ('k') | content/renderer/media/media_recorder_handler.h » ('j') | no next file with comments »