third_party/WebKit/Source/modules/mediastream/MediaStream.h - 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: third_party/WebKit/Source/modules/mediastream/MediaStream.h

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') | « third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.idl ('k') | third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediastream/MediaStream.h

diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStream.h b/third_party/WebKit/Source/modules/mediastream/MediaStream.h

index ba2afa2208fce83557e150f8a9c7866179476c72..3cd33db585731201ed6e9979ba43ea8487544df6 100644

--- a/third_party/WebKit/Source/modules/mediastream/MediaStream.h

+++ b/third_party/WebKit/Source/modules/mediastream/MediaStream.h

@@ -38,7 +38,7 @@ namespace blink {

class ExceptionState;

-class MODULES_EXPORT MediaStream

+class MODULES_EXPORT MediaStream final

: public RefCountedGarbageCollectedEventTargetWithInlineData<MediaStream>

, public URLRegistrable

, public MediaStreamDescriptorClient

@@ -89,8 +89,6 @@ public:

DECLARE_VIRTUAL_TRACE();

private:

- friend class CanvasCaptureMediaStream;

MediaStream(ExecutionContext*, MediaStreamDescriptor*);

MediaStream(ExecutionContext*, const MediaStreamTrackVector& audioTracks, const MediaStreamTrackVector& videoTracks);