Chromium Code Reviews

Unified Diff: Source/Platform/chromium/public/WebMediaStream.h

Issue 12326102: Merge 142773 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
« no previous file with comments | « no previous file | Source/Platform/chromium/public/WebMediaStreamTrack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/Platform/chromium/public/WebMediaStream.h
===================================================================
--- Source/Platform/chromium/public/WebMediaStream.h (revision 143918)
+++ Source/Platform/chromium/public/WebMediaStream.h (working copy)
@@ -36,8 +36,8 @@
namespace WebKit {
+class WebMediaStreamSource;
class WebMediaStreamTrack;
-class WebMediaStreamSource;
class WebString;
class WebMediaStream {
@@ -59,7 +59,11 @@
WEBKIT_EXPORT void assign(const WebMediaStream&);
+ // DEPRECATED
WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
+
+ WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamTrack>& audioTracks, const WebVector<WebMediaStreamTrack>& videoTracks);
+
WEBKIT_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
@@ -68,9 +72,13 @@
WEBKIT_EXPORT WebString id() const;
- WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamTrack>&) const;
- WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamTrack>&) const;
+ WEBKIT_EXPORT void audioTracks(WebVector<WebMediaStreamTrack>&) const;
+ WEBKIT_EXPORT void videoTracks(WebVector<WebMediaStreamTrack>&) const;
+ // DEPRECATED
+ void audioSources(WebVector<WebMediaStreamTrack>& tracks) const { audioTracks(tracks); }
+ void videoSources(WebVector<WebMediaStreamTrack>& tracks) const { videoTracks(tracks); }
+
// Extra data associated with this WebMediaStream.
// If non-null, the extra data pointer will be deleted when the object is destroyed.
// Setting the extra data pointer will cause any existing non-null
« no previous file with comments | « no previous file | Source/Platform/chromium/public/WebMediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine