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

Side by Side Diff: Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.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 | « Source/core/platform/mediastream/RTCPeerConnectionHandler.h ('k') | Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp » ('j') | no next file with comments »
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 are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * 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 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 50 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
61 virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefP tr<MediaConstraints>) OVERRIDE;	61 virtual void createAnswer(PassRefPtr<RTCSessionDescriptionRequest>, PassRefP tr<MediaConstraints>) OVERRIDE;

62 virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCS essionDescription) OVERRIDE;	62 virtual void setLocalDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTCS essionDescription) OVERRIDE;

63 virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTC SessionDescription) OVERRIDE;	63 virtual void setRemoteDescription(PassRefPtr<RTCVoidRequest>, WebKit::WebRTC SessionDescription) OVERRIDE;

64 virtual WebKit::WebRTCSessionDescription localDescription() OVERRIDE;	64 virtual WebKit::WebRTCSessionDescription localDescription() OVERRIDE;

65 virtual WebKit::WebRTCSessionDescription remoteDescription() OVERRIDE;	65 virtual WebKit::WebRTCSessionDescription remoteDescription() OVERRIDE;

66 virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstra ints>) OVERRIDE;	66 virtual bool updateIce(PassRefPtr<RTCConfiguration>, PassRefPtr<MediaConstra ints>) OVERRIDE;

67 virtual bool addIceCandidate(WebKit::WebRTCICECandidate) OVERRIDE;	67 virtual bool addIceCandidate(WebKit::WebRTCICECandidate) OVERRIDE;

68 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaCo nstraints>) OVERRIDE;	68 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaCo nstraints>) OVERRIDE;

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

70 virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE;	70 virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE;

71 virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& la bel, bool reliable) OVERRIDE;	71 virtual PassOwnPtr<RTCDataChannelHandler> createDataChannel(const String& la bel, const WebKit::WebRTCDataChannelInit&) OVERRIDE;

72 virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaSt reamComponent>) OVERRIDE;	72 virtual PassOwnPtr<RTCDTMFSenderHandler> createDTMFSender(PassRefPtr<MediaSt reamComponent>) OVERRIDE;

73 virtual void stop() OVERRIDE;	73 virtual void stop() OVERRIDE;

74	74

75 // WebKit::WebRTCPeerConnectionHandlerClient implementation.	75 // WebKit::WebRTCPeerConnectionHandlerClient implementation.

76 virtual void negotiationNeeded() OVERRIDE;	76 virtual void negotiationNeeded() OVERRIDE;

77 virtual void didGenerateICECandidate(const WebKit::WebRTCICECandidate&) OVER RIDE;	77 virtual void didGenerateICECandidate(const WebKit::WebRTCICECandidate&) OVER RIDE;

78 virtual void didChangeSignalingState(WebKit::WebRTCPeerConnectionHandlerClie nt::SignalingState) OVERRIDE;	78 virtual void didChangeSignalingState(WebKit::WebRTCPeerConnectionHandlerClie nt::SignalingState) OVERRIDE;

79 virtual void didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerC lient::ICEGatheringState) OVERRIDE;	79 virtual void didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerC lient::ICEGatheringState) OVERRIDE;

80 virtual void didChangeICEConnectionState(WebKit::WebRTCPeerConnectionHandler Client::ICEConnectionState) OVERRIDE;	80 virtual void didChangeICEConnectionState(WebKit::WebRTCPeerConnectionHandler Client::ICEConnectionState) OVERRIDE;

81 virtual void didAddRemoteStream(const WebKit::WebMediaStream&) OVERRIDE;	81 virtual void didAddRemoteStream(const WebKit::WebMediaStream&) OVERRIDE;

82 virtual void didRemoveRemoteStream(const WebKit::WebMediaStream&) OVERRIDE;	82 virtual void didRemoveRemoteStream(const WebKit::WebMediaStream&) OVERRIDE;

83 virtual void didAddRemoteDataChannel(WebKit::WebRTCDataChannelHandler*) OVER RIDE;	83 virtual void didAddRemoteDataChannel(WebKit::WebRTCDataChannelHandler*) OVER RIDE;

84	84

85 static WebKit::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RT CPeerConnectionHandler*);	85 static WebKit::WebRTCPeerConnectionHandler* toWebRTCPeerConnectionHandler(RT CPeerConnectionHandler*);

86	86

87 private:	87 private:

88 OwnPtr<WebKit::WebRTCPeerConnectionHandler> m_webHandler;	88 OwnPtr<WebKit::WebRTCPeerConnectionHandler> m_webHandler;

89 RTCPeerConnectionHandlerClient* m_client;	89 RTCPeerConnectionHandlerClient* m_client;

90 };	90 };

91	91

92 } // namespace WebCore	92 } // namespace WebCore

93	93

94 #endif // RTCPeerConnectionHandlerChromium_h	94 #endif // RTCPeerConnectionHandlerChromium_h

OLD	NEW