Chromium Code Reviews| 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 782 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 793 WebRTCSessionDescription webSessionDescription = | 793 WebRTCSessionDescription webSessionDescription = |
| 794 m_peerHandler->remoteDescription(); | 794 m_peerHandler->remoteDescription(); |
| 795 if (webSessionDescription.isNull()) | 795 if (webSessionDescription.isNull()) |
| 796 return nullptr; | 796 return nullptr; |
| 797 | 797 |
| 798 return RTCSessionDescription::create(webSessionDescription); | 798 return RTCSessionDescription::create(webSessionDescription); |
| 799 } | 799 } |
| 800 | 800 |
| 801 void RTCPeerConnection::updateIce(ExecutionContext* context, | 801 void RTCPeerConnection::updateIce(ExecutionContext* context, |
| 802 const RTCConfiguration& rtcConfiguration, | 802 const RTCConfiguration& rtcConfiguration, |
| 803 const Dictionary& mediaConstraints, | 803 const Dictionary&, |
| 804 ExceptionState& exceptionState) { | 804 ExceptionState& exceptionState) { |
| 805 if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) | 805 if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState)) |
| 806 return; | 806 return; |
| 807 | 807 |
| 808 RtcpMuxPolicy selectedRtcpMuxPolicy = RtcpMuxPolicyDefault; | 808 RtcpMuxPolicy selectedRtcpMuxPolicy = RtcpMuxPolicyDefault; |
| 809 WebRTCConfiguration configuration = parseConfiguration( | 809 WebRTCConfiguration configuration = parseConfiguration( |
| 810 context, rtcConfiguration, exceptionState, &selectedRtcpMuxPolicy); | 810 context, rtcConfiguration, exceptionState, &selectedRtcpMuxPolicy); |
| 811 | 811 |
| 812 if (exceptionState.hadException()) | 812 if (exceptionState.hadException()) |
| 813 return; | 813 return; |
| 814 | 814 |
| 815 MediaErrorState mediaErrorState; | 815 MediaErrorState mediaErrorState; |
| 816 if (mediaErrorState.hadException()) { | 816 if (mediaErrorState.hadException()) { |
| 817 mediaErrorState.raiseException(exceptionState); | 817 mediaErrorState.raiseException(exceptionState); |
| 818 return; | 818 return; |
| 819 } | 819 } |
| 820 | 820 |
| 821 // Constraints are ignored. | 821 // TODO(deadbeef): When this changes to setConfiguration, call |
| 822 bool valid = m_peerHandler->updateICE(configuration); | 822 // m_peerHandler->setConfiguration. |
|
hbos_chromium
2016/11/21 09:13:04
This will now no longer track updateIce (RTCPeerCo
hbos_chromium
2016/11/21 09:17:56
If you land as-is (up to you) take a note of this
| |
| 823 if (!valid) | 823 exceptionState.throwDOMException( |
| 824 exceptionState.throwDOMException( | 824 SyntaxError, |
| 825 SyntaxError, | 825 "Could not update the ICE Agent with the given configuration."); |
| 826 "Could not update the ICE Agent with the given configuration."); | |
| 827 } | 826 } |
| 828 | 827 |
| 829 ScriptPromise RTCPeerConnection::generateCertificate( | 828 ScriptPromise RTCPeerConnection::generateCertificate( |
| 830 ScriptState* scriptState, | 829 ScriptState* scriptState, |
| 831 const AlgorithmIdentifier& keygenAlgorithm, | 830 const AlgorithmIdentifier& keygenAlgorithm, |
| 832 ExceptionState& exceptionState) { | 831 ExceptionState& exceptionState) { |
| 833 // Normalize |keygenAlgorithm| with WebCrypto, making sure it is a recognized | 832 // Normalize |keygenAlgorithm| with WebCrypto, making sure it is a recognized |
| 834 // AlgorithmIdentifier. | 833 // AlgorithmIdentifier. |
| 835 WebCryptoAlgorithm cryptoAlgorithm; | 834 WebCryptoAlgorithm cryptoAlgorithm; |
| 836 AlgorithmError error; | 835 AlgorithmError error; |
| (...skipping 642 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1479 DEFINE_TRACE(RTCPeerConnection) { | 1478 DEFINE_TRACE(RTCPeerConnection) { |
| 1480 visitor->trace(m_localStreams); | 1479 visitor->trace(m_localStreams); |
| 1481 visitor->trace(m_remoteStreams); | 1480 visitor->trace(m_remoteStreams); |
| 1482 visitor->trace(m_dispatchScheduledEventRunner); | 1481 visitor->trace(m_dispatchScheduledEventRunner); |
| 1483 visitor->trace(m_scheduledEvents); | 1482 visitor->trace(m_scheduledEvents); |
| 1484 EventTargetWithInlineData::trace(visitor); | 1483 EventTargetWithInlineData::trace(visitor); |
| 1485 ActiveDOMObject::trace(visitor); | 1484 ActiveDOMObject::trace(visitor); |
| 1486 } | 1485 } |
| 1487 | 1486 |
| 1488 } // namespace blink | 1487 } // namespace blink |
| OLD | NEW |