| 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 14 matching lines...) Expand all Loading... |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h" | 33 #include "core/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h" |
| 34 | 34 |
| 35 #include "core/platform/mediastream/MediaConstraints.h" | |
| 36 #include "core/platform/mediastream/MediaStreamComponent.h" | 35 #include "core/platform/mediastream/MediaStreamComponent.h" |
| 37 #include "core/platform/mediastream/RTCConfiguration.h" | 36 #include "core/platform/mediastream/RTCConfiguration.h" |
| 38 #include "core/platform/mediastream/RTCDTMFSenderHandler.h" | 37 #include "core/platform/mediastream/RTCDTMFSenderHandler.h" |
| 39 #include "core/platform/mediastream/RTCDataChannelHandlerClient.h" | |
| 40 #include "core/platform/mediastream/RTCIceCandidateDescriptor.h" | 38 #include "core/platform/mediastream/RTCIceCandidateDescriptor.h" |
| 41 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h" | 39 #include "core/platform/mediastream/RTCPeerConnectionHandlerClient.h" |
| 42 #include "core/platform/mediastream/RTCSessionDescriptionDescriptor.h" | 40 #include "core/platform/mediastream/RTCSessionDescriptionDescriptor.h" |
| 43 #include "core/platform/mediastream/RTCSessionDescriptionRequest.h" | |
| 44 #include "core/platform/mediastream/RTCStatsRequest.h" | |
| 45 #include "core/platform/mediastream/RTCVoidRequest.h" | |
| 46 #include "core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.h" | 41 #include "core/platform/mediastream/chromium/RTCDTMFSenderHandlerChromium.h" |
| 47 #include "core/platform/mediastream/chromium/RTCDataChannelHandlerChromium.h" | 42 #include "core/platform/mediastream/chromium/RTCDataChannelHandlerChromium.h" |
| 48 #include <public/Platform.h> | 43 #include <public/Platform.h> |
| 49 #include <public/WebMediaConstraints.h> | 44 #include <public/WebMediaConstraints.h> |
| 50 #include <public/WebMediaStream.h> | 45 #include <public/WebMediaStream.h> |
| 51 #include <public/WebMediaStreamTrack.h> | 46 #include <public/WebMediaStreamTrack.h> |
| 52 #include <public/WebRTCConfiguration.h> | 47 #include <public/WebRTCConfiguration.h> |
| 53 #include <public/WebRTCDataChannelHandler.h> | 48 #include <public/WebRTCDataChannelHandler.h> |
| 54 #include <public/WebRTCDTMFSenderHandler.h> | 49 #include <public/WebRTCDTMFSenderHandler.h> |
| 55 #include <public/WebRTCICECandidate.h> | 50 #include <public/WebRTCICECandidate.h> |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 m_client->didRemoveRemoteStream(webMediaStreamDescriptor); | 205 m_client->didRemoveRemoteStream(webMediaStreamDescriptor); |
| 211 } | 206 } |
| 212 | 207 |
| 213 void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(WebKit::WebRTCDat
aChannelHandler* webHandler) | 208 void RTCPeerConnectionHandlerChromium::didAddRemoteDataChannel(WebKit::WebRTCDat
aChannelHandler* webHandler) |
| 214 { | 209 { |
| 215 ASSERT(webHandler); | 210 ASSERT(webHandler); |
| 216 m_client->didAddRemoteDataChannel(RTCDataChannelHandlerChromium::create(webH
andler)); | 211 m_client->didAddRemoteDataChannel(RTCDataChannelHandlerChromium::create(webH
andler)); |
| 217 } | 212 } |
| 218 | 213 |
| 219 } // namespace WebCore | 214 } // namespace WebCore |
| OLD | NEW |