| 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 28 matching lines...) Expand all Loading... |
| 39 #include "bindings/core/v8/ScriptValue.h" | 39 #include "bindings/core/v8/ScriptValue.h" |
| 40 #include "bindings/core/v8/V8ThrowException.h" | 40 #include "bindings/core/v8/V8ThrowException.h" |
| 41 #include "bindings/modules/v8/RTCIceCandidateInitOrRTCIceCandidate.h" | 41 #include "bindings/modules/v8/RTCIceCandidateInitOrRTCIceCandidate.h" |
| 42 #include "bindings/modules/v8/V8MediaStreamTrack.h" | 42 #include "bindings/modules/v8/V8MediaStreamTrack.h" |
| 43 #include "bindings/modules/v8/V8RTCCertificate.h" | 43 #include "bindings/modules/v8/V8RTCCertificate.h" |
| 44 #include "core/dom/DOMException.h" | 44 #include "core/dom/DOMException.h" |
| 45 #include "core/dom/DOMTimeStamp.h" | 45 #include "core/dom/DOMTimeStamp.h" |
| 46 #include "core/dom/Document.h" | 46 #include "core/dom/Document.h" |
| 47 #include "core/dom/ExceptionCode.h" | 47 #include "core/dom/ExceptionCode.h" |
| 48 #include "core/dom/ExecutionContext.h" | 48 #include "core/dom/ExecutionContext.h" |
| 49 #include "core/frame/Deprecation.h" |
| 49 #include "core/frame/HostsUsingFeatures.h" | 50 #include "core/frame/HostsUsingFeatures.h" |
| 50 #include "core/frame/LocalFrame.h" | 51 #include "core/frame/LocalFrame.h" |
| 51 #include "core/frame/UseCounter.h" | 52 #include "core/frame/UseCounter.h" |
| 52 #include "core/html/VoidCallback.h" | 53 #include "core/html/VoidCallback.h" |
| 53 #include "core/loader/FrameLoader.h" | 54 #include "core/loader/FrameLoader.h" |
| 54 #include "core/loader/FrameLoaderClient.h" | 55 #include "core/loader/FrameLoaderClient.h" |
| 55 #include "modules/crypto/CryptoResultImpl.h" | 56 #include "modules/crypto/CryptoResultImpl.h" |
| 56 #include "modules/mediastream/MediaConstraintsImpl.h" | 57 #include "modules/mediastream/MediaConstraintsImpl.h" |
| 57 #include "modules/mediastream/MediaStreamEvent.h" | 58 #include "modules/mediastream/MediaStreamEvent.h" |
| 58 #include "modules/peerconnection/RTCAnswerOptions.h" | 59 #include "modules/peerconnection/RTCAnswerOptions.h" |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 257 } else if (bundlePolicyString == "max-bundle") { | 258 } else if (bundlePolicyString == "max-bundle") { |
| 258 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; | 259 bundlePolicy = WebRTCBundlePolicy::kMaxBundle; |
| 259 } else { | 260 } else { |
| 260 DCHECK_EQ(bundlePolicyString, "balanced"); | 261 DCHECK_EQ(bundlePolicyString, "balanced"); |
| 261 } | 262 } |
| 262 | 263 |
| 263 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; | 264 WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire; |
| 264 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); | 265 String rtcpMuxPolicyString = configuration.rtcpMuxPolicy(); |
| 265 if (rtcpMuxPolicyString == "negotiate") { | 266 if (rtcpMuxPolicyString == "negotiate") { |
| 266 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; | 267 rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate; |
| 268 Deprecation::countDeprecation(context, UseCounter::RtcpMuxPolicyNegotiate); |
| 267 } else { | 269 } else { |
| 268 DCHECK_EQ(rtcpMuxPolicyString, "require"); | 270 DCHECK_EQ(rtcpMuxPolicyString, "require"); |
| 269 } | 271 } |
| 270 WebRTCConfiguration webConfiguration; | 272 WebRTCConfiguration webConfiguration; |
| 271 webConfiguration.iceTransportPolicy = iceTransportPolicy; | 273 webConfiguration.iceTransportPolicy = iceTransportPolicy; |
| 272 webConfiguration.bundlePolicy = bundlePolicy; | 274 webConfiguration.bundlePolicy = bundlePolicy; |
| 273 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; | 275 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; |
| 274 | 276 |
| 275 if (configuration.hasIceServers()) { | 277 if (configuration.hasIceServers()) { |
| 276 Vector<WebRTCIceServer> iceServers; | 278 Vector<WebRTCIceServer> iceServers; |
| (...skipping 1209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1486 DEFINE_TRACE(RTCPeerConnection) { | 1488 DEFINE_TRACE(RTCPeerConnection) { |
| 1487 visitor->trace(m_localStreams); | 1489 visitor->trace(m_localStreams); |
| 1488 visitor->trace(m_remoteStreams); | 1490 visitor->trace(m_remoteStreams); |
| 1489 visitor->trace(m_dispatchScheduledEventRunner); | 1491 visitor->trace(m_dispatchScheduledEventRunner); |
| 1490 visitor->trace(m_scheduledEvents); | 1492 visitor->trace(m_scheduledEvents); |
| 1491 EventTargetWithInlineData::trace(visitor); | 1493 EventTargetWithInlineData::trace(visitor); |
| 1492 SuspendableObject::trace(visitor); | 1494 SuspendableObject::trace(visitor); |
| 1493 } | 1495 } |
| 1494 | 1496 |
| 1495 } // namespace blink | 1497 } // namespace blink |
| OLD | NEW |