content/renderer/media/media_stream_center.cc - Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource

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/media_stream_center.cc

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 6 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

« no previous file with comments | « content/content_renderer.gypi ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | content/renderer/media/media_stream_video_capture_device_source.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_center.cc

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

index daf1a499507e48e30815bbaf9d6f41e2c6b03c48..c9be32e0c3912e98b788baa883a6aff6025fbc44 100644

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

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

@@ -16,7 +16,7 @@

#include "content/public/renderer/render_thread.h"

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

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

-#include "content/renderer/media/media_stream_source_extra_data.h"

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

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

#include "content/renderer/render_view_impl.h"

#include "third_party/WebKit/public/platform/WebMediaStream.h"

@@ -80,8 +80,8 @@ bool MediaStreamCenter::didStopMediaStreamTrack(

const blink::WebMediaStreamTrack& track) {

DVLOG(1) << "MediaStreamCenter::didStopMediaStreamTrack";

blink::WebMediaStreamSource source = track.source();

- MediaStreamSourceExtraData* extra_data =

- static_cast<MediaStreamSourceExtraData*>(source.extraData());

+ MediaStreamSource* extra_data =

+ static_cast<MediaStreamSource*>(source.extraData());

if (!extra_data) {

DVLOG(1) << "didStopMediaStreamTrack called on a remote track.";

return false;