Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(117)

Unified Diff: Source/Platform/chromium/public/WebMediaStreamTrack.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. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/Platform/chromium/public/WebMediaStreamTrack.h
===================================================================
--- Source/Platform/chromium/public/WebMediaStreamTrack.h (revision 143918)
+++ Source/Platform/chromium/public/WebMediaStreamTrack.h (working copy)
@@ -50,7 +50,10 @@
return *this;
}
WEBKIT_EXPORT void assign(const WebMediaStreamTrack&);
+
WEBKIT_EXPORT void initialize(const WebMediaStreamSource&);
+ WEBKIT_EXPORT void initialize(const WebString& id, const WebMediaStreamSource&);
+
WEBKIT_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
« no previous file with comments | « Source/Platform/chromium/public/WebMediaStream.h ('k') | Source/WebCore/platform/chromium/support/WebMediaStream.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698