| Index: Source/modules/mediastream/RTCDataChannel.cpp
|
| diff --git a/Source/modules/mediastream/RTCDataChannel.cpp b/Source/modules/mediastream/RTCDataChannel.cpp
|
| index 4172ad20d85758baa67fbb86d44e49b6ef9a7649..38e64240a7e1b8ab4597dd6bb8a13a039f3c0728 100644
|
| --- a/Source/modules/mediastream/RTCDataChannel.cpp
|
| +++ b/Source/modules/mediastream/RTCDataChannel.cpp
|
| @@ -38,9 +38,15 @@
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, bool reliable, ExceptionCode& ec)
|
| +PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)
|
| +{
|
| + ASSERT(handler);
|
| + return adoptRef(new RTCDataChannel(context, handler));
|
| +}
|
| +
|
| +PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, RTCPeerConnectionHandler* peerConnectionHandler, const String& label, const WebKit::WebRTCDataChannelInit& init, ExceptionCode& ec)
|
| {
|
| - OwnPtr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, reliable);
|
| + OwnPtr<RTCDataChannelHandler> handler = peerConnectionHandler->createDataChannel(label, init);
|
| if (!handler) {
|
| ec = NOT_SUPPORTED_ERR;
|
| return 0;
|
| @@ -48,12 +54,6 @@ PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* contex
|
| return adoptRef(new RTCDataChannel(context, handler.release()));
|
| }
|
|
|
| -PassRefPtr<RTCDataChannel> RTCDataChannel::create(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)
|
| -{
|
| - ASSERT(handler);
|
| - return adoptRef(new RTCDataChannel(context, handler));
|
| -}
|
| -
|
| RTCDataChannel::RTCDataChannel(ScriptExecutionContext* context, PassOwnPtr<RTCDataChannelHandler> handler)
|
| : m_scriptExecutionContext(context)
|
| , m_handler(handler)
|
|
|