third_party/WebKit/Source/modules/mediastream/MediaStream.h - Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/MediaStream.h

Issue 1815033003: Add srcObject attribute of type MediaStream to HTMLMediaElement. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: philipj's comments Created 4 years, 8 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 unified diff | Download patch

« third_party/WebKit/Source/core/html/HTMLMediaElement.h ('K') | « third_party/WebKit/Source/core/loader/FrameLoaderClient.h ('k') | third_party/WebKit/Source/modules/mediastream/MediaStream.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 * Copyright (C) 2011 Ericsson AB. All rights reserved.	3 * Copyright (C) 2011 Ericsson AB. All rights reserved.

4 *	4 *

5 * Redistribution and use in source and binary forms, with or without	5 * Redistribution and use in source and binary forms, with or without

6 * modification, are permitted provided that the following conditions	6 * modification, are permitted provided that the following conditions

7 * are met:	7 * are met:

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
109 MediaStreamTrackVector m_audioTracks;	109 MediaStreamTrackVector m_audioTracks;

110 MediaStreamTrackVector m_videoTracks;	110 MediaStreamTrackVector m_videoTracks;

111 Member<MediaStreamDescriptor> m_descriptor;	111 Member<MediaStreamDescriptor> m_descriptor;

112	112

113 Timer<MediaStream> m_scheduledEventTimer;	113 Timer<MediaStream> m_scheduledEventTimer;

114 HeapVector<Member<Event>> m_scheduledEvents;	114 HeapVector<Member<Event>> m_scheduledEvents;

115 };	115 };

116	116

117 typedef HeapVector<Member<MediaStream>> MediaStreamVector;	117 typedef HeapVector<Member<MediaStream>> MediaStreamVector;

118	118

	119 MediaStream* toMediaStream(MediaStreamDescriptor*);

	120

119 } // namespace blink	121 } // namespace blink

120	122

121 #endif // MediaStream_h	123 #endif // MediaStream_h

OLD	NEW