Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(23)

Side by Side Diff: Source/core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp

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
OLDNEW
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 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 void RTCPeerConnectionHandlerChromium::removeStream(PassRefPtr<MediaStreamDescri ptor> mediaStream) 142 void RTCPeerConnectionHandlerChromium::removeStream(PassRefPtr<MediaStreamDescri ptor> mediaStream)
143 { 143 {
144 m_webHandler->removeStream(mediaStream); 144 m_webHandler->removeStream(mediaStream);
145 } 145 }
146 146
147 void RTCPeerConnectionHandlerChromium::getStats(PassRefPtr<RTCStatsRequest> requ est) 147 void RTCPeerConnectionHandlerChromium::getStats(PassRefPtr<RTCStatsRequest> requ est)
148 { 148 {
149 m_webHandler->getStats(request); 149 m_webHandler->getStats(request);
150 } 150 }
151 151
152 PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandlerChromium::createDataCh annel(const String& label, bool reliable) 152 PassOwnPtr<RTCDataChannelHandler> RTCPeerConnectionHandlerChromium::createDataCh annel(const String& label, const WebKit::WebRTCDataChannelInit& init)
153 { 153 {
154 WebKit::WebRTCDataChannelHandler* webHandler = m_webHandler->createDataChann el(label, reliable); 154 WebKit::WebRTCDataChannelHandler* webHandler = m_webHandler->createDataChann el(label, init);
155 if (!webHandler) 155 if (!webHandler)
156 return nullptr; 156 return nullptr;
157 157
158 return RTCDataChannelHandlerChromium::create(webHandler); 158 return RTCDataChannelHandlerChromium::create(webHandler);
159 } 159 }
160 160
161 PassOwnPtr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerChromium::createDTMFSen der(PassRefPtr<MediaStreamComponent> track) 161 PassOwnPtr<RTCDTMFSenderHandler> RTCPeerConnectionHandlerChromium::createDTMFSen der(PassRefPtr<MediaStreamComponent> track)
162 { 162 {
163 WebKit::WebRTCDTMFSenderHandler* webHandler = m_webHandler->createDTMFSender (track); 163 WebKit::WebRTCDTMFSenderHandler* webHandler = m_webHandler->createDTMFSender (track);
164 if (!webHandler) 164 if (!webHandler)
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
207 m_client->didRemoveRemoteStream(webMediaStreamDescriptor); 207 m_client->didRemoveRemoteStream(webMediaStreamDescriptor);
208 } 208 }
209 209
210 void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(WebKit::WebRTCDat aChannelHandler* webHandler) 210 void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(WebKit::WebRTCDat aChannelHandler* webHandler)
211 { 211 {
212 ASSERT(webHandler); 212 ASSERT(webHandler);
213 m_client->didAddRemoteDataChannel(RTCDataChannelHandlerChromium::create(webH andler)); 213 m_client->didAddRemoteDataChannel(RTCDataChannelHandlerChromium::create(webH andler));
214 } 214 }
215 215
216 } // namespace WebCore 216 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698