Source/Platform/chromium/public/WebMediaStreamTrack.h - Issue 12326102: Merge 142773

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: 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:

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(); }