Source/WebKit/chromium/src/WebMediaStreamRegistry.cpp - Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly"

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/WebKit/chromium/src/WebMediaStreamRegistry.cpp

Issue 16753003: Revert "Remove MediaStreamDescriptor and call/use WebMediaStream directly" (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 6 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/WebKit/chromium/src/WebMediaStreamRegistry.cpp

diff --git a/Source/WebKit/chromium/src/WebMediaStreamRegistry.cpp b/Source/WebKit/chromium/src/WebMediaStreamRegistry.cpp

index cfb7da60fd56624ca181062eb9c2bfa462614866..077dbd1037815c0699a2e925de0381ce374b688b 100644

--- a/Source/WebKit/chromium/src/WebMediaStreamRegistry.cpp

+++ b/Source/WebKit/chromium/src/WebMediaStreamRegistry.cpp

@@ -32,6 +32,7 @@

#include "WebMediaStreamRegistry.h"

+#include "core/platform/mediastream/MediaStreamDescriptor.h"

#include "modules/mediastream/MediaStreamRegistry.h"

#include "public/platform/WebMediaStream.h"

#include "public/platform/WebString.h"

@@ -44,7 +45,7 @@ namespace WebKit {

WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL& url)

{

- return WebMediaStream(MediaStreamRegistry::registry().lookupWebMediaStream(KURL(url).string()));

+ return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescriptor(KURL(url).string()));

}

} // namespace WebKit