Source/core/platform/mediastream/RTCPeerConnectionHandler.h - Issue 16305017: Removes the old createDataChannel and starts to use the new one with WebRTCDataChannelInit

Side by Side Diff: Source/core/platform/mediastream/RTCPeerConnectionHandler.h

Issue 16305017: Removes the old createDataChannel and starts to use the new one with WebRTCDataChannelInit (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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « LayoutTests/fast/mediastream/RTCPeerConnection-datachannel-expected.txt ('k') | Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h » ('j') | public/platform/WebRTCDataChannelInit.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 20 matching lines...) Expand all Loading...
31 #ifndef RTCPeerConnectionHandler_h	31 #ifndef RTCPeerConnectionHandler_h

32 #define RTCPeerConnectionHandler_h	32 #define RTCPeerConnectionHandler_h

33	33

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

35 #include <wtf/PassOwnPtr.h>	35 #include <wtf/PassOwnPtr.h>

36 #include <wtf/PassRefPtr.h>	36 #include <wtf/PassRefPtr.h>

37	37

38 namespace WebKit {	38 namespace WebKit {

39 class WebRTCICECandidate;	39 class WebRTCICECandidate;

40 class WebRTCSessionDescription;	40 class WebRTCSessionDescription;

	41 struct WebRTCDataChannelInit;

41 }	42 }

42	43

43 namespace WebCore {	44 namespace WebCore {

44	45

45 class MediaConstraints;	46 class MediaConstraints;

46 class MediaStreamComponent;	47 class MediaStreamComponent;

47 class RTCConfiguration;	48 class RTCConfiguration;

48 class RTCDTMFSenderHandler;	49 class RTCDTMFSenderHandler;

49 class RTCDataChannelHandler;	50 class RTCDataChannelHandler;

50 class RTCPeerConnectionHandlerClient;	51 class RTCPeerConnectionHandlerClient;

(...skipping 12 matching lines...) Expand all Loading...
63 virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefP tr<MediaConstraints>) = 0;	64 virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefP tr<MediaConstraints>) = 0;

64 virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCS essionDescription) = 0;	65 virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCS essionDescription) = 0;

65 virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTC SessionDescription) = 0;	66 virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTC SessionDescription) = 0;

66 virtual WebKit::WebRTCSessionDescription localDescription() = 0;	67 virtual WebKit::WebRTCSessionDescription localDescription() = 0;

67 virtual WebKit::WebRTCSessionDescription remoteDescription() = 0;	68 virtual WebKit::WebRTCSessionDescription remoteDescription() = 0;

68 virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstra ints>) = 0;	69 virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstra ints>) = 0;

69 virtual bool addIceCandidate(WebKit::WebRTCICECandidate) = 0;	70 virtual bool addIceCandidate(WebKit::WebRTCICECandidate) = 0;

70 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaCo nstraints>) = 0;	71 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaCo nstraints>) = 0;

71 virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) = 0;	72 virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) = 0;

72 virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;	73 virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;

73 virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& la bel, bool reliable) = 0;	74 virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& la bel, const WebKit::WebRTCDataChannelInit&) = 0;

74 virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaSt reamComponent>) = 0;	75 virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaSt reamComponent>) = 0;

75 virtual void stop() = 0;	76 virtual void stop() = 0;

76	77

77 protected:	78 protected:

78 RTCPeerConnectionHandler() { }	79 RTCPeerConnectionHandler() { }

79 };	80 };

80	81

81 } // namespace WebCore	82 } // namespace WebCore

82	83

83 #endif // RTCPeerConnectionHandler_h	84 #endif // RTCPeerConnectionHandler_h

OLD	NEW