| 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 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 RTCPeerConnection* RTCPeerConnection::create(ExecutionContext* context, const Di
ctionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&
exceptionState) | 210 RTCPeerConnection* RTCPeerConnection::create(ExecutionContext* context, const Di
ctionary& rtcConfiguration, const Dictionary& mediaConstraints, ExceptionState&
exceptionState) |
| 211 { | 211 { |
| 212 RTCConfiguration* configuration = parseConfiguration(rtcConfiguration, excep
tionState); | 212 RTCConfiguration* configuration = parseConfiguration(rtcConfiguration, excep
tionState); |
| 213 if (exceptionState.hadException()) | 213 if (exceptionState.hadException()) |
| 214 return 0; | 214 return 0; |
| 215 | 215 |
| 216 WebMediaConstraints constraints = MediaConstraintsImpl::create(mediaConstrai
nts, exceptionState); | 216 WebMediaConstraints constraints = MediaConstraintsImpl::create(mediaConstrai
nts, exceptionState); |
| 217 if (exceptionState.hadException()) | 217 if (exceptionState.hadException()) |
| 218 return 0; | 218 return 0; |
| 219 | 219 |
| 220 RTCPeerConnection* peerConnection = adoptRefCountedGarbageCollectedWillBeNoo
p(new RTCPeerConnection(context, configuration, constraints, exceptionState)); | 220 RTCPeerConnection* peerConnection = new RTCPeerConnection(context, configura
tion, constraints, exceptionState); |
| 221 peerConnection->suspendIfNeeded(); | 221 peerConnection->suspendIfNeeded(); |
| 222 if (exceptionState.hadException()) | 222 if (exceptionState.hadException()) |
| 223 return 0; | 223 return 0; |
| 224 | 224 |
| 225 return peerConnection; | 225 return peerConnection; |
| 226 } | 226 } |
| 227 | 227 |
| 228 RTCPeerConnection::RTCPeerConnection(ExecutionContext* context, RTCConfiguration
* configuration, WebMediaConstraints constraints, ExceptionState& exceptionState
) | 228 RTCPeerConnection::RTCPeerConnection(ExecutionContext* context, RTCConfiguration
* configuration, WebMediaConstraints constraints, ExceptionState& exceptionState
) |
| 229 : ActiveDOMObject(context) | 229 : ActiveDOMObject(context) |
| 230 , m_signalingState(SignalingStateStable) | 230 , m_signalingState(SignalingStateStable) |
| (...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 805 visitor->trace(m_localStreams); | 805 visitor->trace(m_localStreams); |
| 806 visitor->trace(m_remoteStreams); | 806 visitor->trace(m_remoteStreams); |
| 807 visitor->trace(m_dataChannels); | 807 visitor->trace(m_dataChannels); |
| 808 #if ENABLE(OILPAN) | 808 #if ENABLE(OILPAN) |
| 809 visitor->trace(m_scheduledEvents); | 809 visitor->trace(m_scheduledEvents); |
| 810 #endif | 810 #endif |
| 811 EventTargetWithInlineData::trace(visitor); | 811 EventTargetWithInlineData::trace(visitor); |
| 812 } | 812 } |
| 813 | 813 |
| 814 } // namespace blink | 814 } // namespace blink |
| OLD | NEW |