Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h - 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/core/platform/mediastream/chromium/MediaStreamCenterChromium.h

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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « Source/core/platform/mediastream/RTCStatsRequest.h ('k') | Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h

diff --git a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h

index c2553867acd009d77d529f6cf07710e578d4b296..6a01bc2db7600ace3ce2cedf560ba41060932f67 100644

--- a/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h

+++ b/Source/core/platform/mediastream/chromium/MediaStreamCenterChromium.h

@@ -48,6 +48,7 @@ class WebSourceInfo;

namespace WebCore {

class MediaStreamComponent;

+class MediaStreamDescriptor;

class MediaStreamSourcesQueryClient;

class MediaStreamCenterChromium : public MediaStreamCenter, public WebKit::WebMediaStreamCenterClient {

@@ -58,14 +59,14 @@ public:

// MediaStreamCenter

virtual void queryMediaStreamSources(PassRefPtr<MediaStreamSourcesQueryClient>) OVERRIDE;

virtual bool getSourceInfos(const String& url, WebKit::WebVector<WebKit::WebSourceInfo>&) OVERRIDE;

- virtual void didSetMediaStreamTrackEnabled(WebKit::WebMediaStream, MediaStreamComponent*) OVERRIDE;

- virtual bool didAddMediaStreamTrack(WebKit::WebMediaStream, MediaStreamComponent*) OVERRIDE;

- virtual bool didRemoveMediaStreamTrack(WebKit::WebMediaStream, MediaStreamComponent*) OVERRIDE;

- virtual void didStopLocalMediaStream(WebKit::WebMediaStream) OVERRIDE;

- virtual void didCreateMediaStream(WebKit::WebMediaStream) OVERRIDE;

+ virtual void didSetMediaStreamTrackEnabled(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;

+ virtual bool didAddMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;

+ virtual bool didRemoveMediaStreamTrack(MediaStreamDescriptor*, MediaStreamComponent*) OVERRIDE;

+ virtual void didStopLocalMediaStream(MediaStreamDescriptor*) OVERRIDE;

+ virtual void didCreateMediaStream(MediaStreamDescriptor*) OVERRIDE;

// WebKit::WebMediaStreamCenterClient

- virtual void stopLocalMediaStream(WebKit::WebMediaStream) OVERRIDE;

+ virtual void stopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;

private:

OwnPtr<WebKit::WebMediaStreamCenter> m_private;