Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.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/RTCPeerConnectionHandlerChromium.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/chromium/MediaStreamCenterChromium.cpp ('k') | Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 7189efe04239524c323ffccddd10ca35586d34e5..9a92556b199a2a4778eb79fd4f137fde1a215a40 100644

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

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

@@ -31,14 +31,15 @@

#ifndef RTCPeerConnectionHandlerChromium_h

#define RTCPeerConnectionHandlerChromium_h

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

#include "core/platform/mediastream/RTCPeerConnectionHandler.h"

-#include "public/platform/WebMediaStream.h"

#include "public/platform/WebRTCPeerConnectionHandler.h"

#include "public/platform/WebRTCPeerConnectionHandlerClient.h"

#include <wtf/OwnPtr.h>

#include <wtf/PassRefPtr.h>

namespace WebKit {

+class WebMediaStream;

class WebRTCICECandidate;

class WebRTCSessionDescription;

}

@@ -64,8 +65,8 @@ public:

virtual WebKit::WebRTCSessionDescription remoteDescription() OVERRIDE;

virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstraints>) OVERRIDE;

virtual bool addIceCandidate(WebKit::WebRTCICECandidate) OVERRIDE;

- virtual bool addStream(WebKit::WebMediaStream, PassRefPtr<MediaConstraints>) OVERRIDE;

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

+ virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) OVERRIDE;

+ virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE;

virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE;

virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& label, const WebKit::WebRTCDataChannelInit&) OVERRIDE;

virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaStreamComponent>) OVERRIDE;