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

Side by Side Diff: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

Issue 2720763004: Add a deprecation message to rtcpMuxPolicy of negotiate. (Closed)
Patch Set: Rebaseling the Layout tests Created 3 years, 9 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
« no previous file with comments | « third_party/WebKit/Source/core/frame/Deprecation.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 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 30 matching lines...) Expand all
41 #include "bindings/core/v8/ScriptValue.h" 41 #include "bindings/core/v8/ScriptValue.h"
42 #include "bindings/core/v8/V8ThrowException.h" 42 #include "bindings/core/v8/V8ThrowException.h"
43 #include "bindings/modules/v8/RTCIceCandidateInitOrRTCIceCandidate.h" 43 #include "bindings/modules/v8/RTCIceCandidateInitOrRTCIceCandidate.h"
44 #include "bindings/modules/v8/V8MediaStreamTrack.h" 44 #include "bindings/modules/v8/V8MediaStreamTrack.h"
45 #include "bindings/modules/v8/V8RTCCertificate.h" 45 #include "bindings/modules/v8/V8RTCCertificate.h"
46 #include "core/dom/DOMException.h" 46 #include "core/dom/DOMException.h"
47 #include "core/dom/DOMTimeStamp.h" 47 #include "core/dom/DOMTimeStamp.h"
48 #include "core/dom/Document.h" 48 #include "core/dom/Document.h"
49 #include "core/dom/ExceptionCode.h" 49 #include "core/dom/ExceptionCode.h"
50 #include "core/dom/ExecutionContext.h" 50 #include "core/dom/ExecutionContext.h"
51 #include "core/frame/Deprecation.h"
51 #include "core/frame/HostsUsingFeatures.h" 52 #include "core/frame/HostsUsingFeatures.h"
52 #include "core/frame/LocalFrame.h" 53 #include "core/frame/LocalFrame.h"
53 #include "core/frame/LocalFrameClient.h" 54 #include "core/frame/LocalFrameClient.h"
54 #include "core/frame/UseCounter.h" 55 #include "core/frame/UseCounter.h"
55 #include "core/html/VoidCallback.h" 56 #include "core/html/VoidCallback.h"
56 #include "core/loader/FrameLoader.h" 57 #include "core/loader/FrameLoader.h"
57 #include "modules/crypto/CryptoResultImpl.h" 58 #include "modules/crypto/CryptoResultImpl.h"
58 #include "modules/mediastream/MediaConstraintsImpl.h" 59 #include "modules/mediastream/MediaConstraintsImpl.h"
59 #include "modules/mediastream/MediaStreamEvent.h" 60 #include "modules/mediastream/MediaStreamEvent.h"
60 #include "modules/peerconnection/RTCAnswerOptions.h" 61 #include "modules/peerconnection/RTCAnswerOptions.h"
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
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;
267 UseCounter::count(context, UseCounter::RtcpMuxPolicyNegotiate); 268 Deprecation::countDeprecation(context, UseCounter::RtcpMuxPolicyNegotiate);
268 } else { 269 } else {
269 DCHECK_EQ(rtcpMuxPolicyString, "require"); 270 DCHECK_EQ(rtcpMuxPolicyString, "require");
270 } 271 }
271 WebRTCConfiguration webConfiguration; 272 WebRTCConfiguration webConfiguration;
272 webConfiguration.iceTransportPolicy = iceTransportPolicy; 273 webConfiguration.iceTransportPolicy = iceTransportPolicy;
273 webConfiguration.bundlePolicy = bundlePolicy; 274 webConfiguration.bundlePolicy = bundlePolicy;
274 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy; 275 webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy;
275 276
276 if (configuration.hasIceServers()) { 277 if (configuration.hasIceServers()) {
277 Vector<WebRTCIceServer> iceServers; 278 Vector<WebRTCIceServer> iceServers;
(...skipping 1216 matching lines...) Expand 10 before | Expand all | Expand 10 after
1494 DEFINE_TRACE(RTCPeerConnection) { 1495 DEFINE_TRACE(RTCPeerConnection) {
1495 visitor->trace(m_localStreams); 1496 visitor->trace(m_localStreams);
1496 visitor->trace(m_remoteStreams); 1497 visitor->trace(m_remoteStreams);
1497 visitor->trace(m_dispatchScheduledEventRunner); 1498 visitor->trace(m_dispatchScheduledEventRunner);
1498 visitor->trace(m_scheduledEvents); 1499 visitor->trace(m_scheduledEvents);
1499 EventTargetWithInlineData::trace(visitor); 1500 EventTargetWithInlineData::trace(visitor);
1500 SuspendableObject::trace(visitor); 1501 SuspendableObject::trace(visitor);
1501 } 1502 }
1502 1503
1503 } // namespace blink 1504 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/Deprecation.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698