Support RTCConfiguration iceTransportPolicy

third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 207 matching lines @@
   Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 WebRTCConfiguration parseConfiguration(ExecutionContext* context,
                                        const RTCConfiguration& configuration,
                                        ExceptionState& exceptionState,
                                        RtcpMuxPolicy* selectedRtcpMuxPolicy) {
   DCHECK(context);
   DCHECK(selectedRtcpMuxPolicy);
 
-  WebRTCIceTransports iceTransports = WebRTCIceTransports::kAll;
-  String iceTransportsString = configuration.iceTransports();
-  if (iceTransportsString == "none") {
-    UseCounter::count(context, UseCounter::RTCConfigurationIceTransportsNone);
-    iceTransports = WebRTCIceTransports::kNone;
-  } else if (iceTransportsString == "relay") {
-    iceTransports = WebRTCIceTransports::kRelay;
-  } else {
-    DCHECK_EQ(iceTransportsString, "all");
+  WebRTCIceTransportPolicy iceTransportPolicy = WebRTCIceTransportPolicy::kAll;
+  if (configuration.hasIceTransportPolicy()) {
+    UseCounter::count(context, UseCounter::RTCConfigurationIceTransportPolicy);
+    String iceTransportPolicyString = configuration.iceTransportPolicy();
+    if (iceTransportPolicyString == "none") {
+      UseCounter::count(context,
+                        UseCounter::RTCConfigurationIceTransportPolicyNone);
+      iceTransportPolicy = WebRTCIceTransportPolicy::kNone;
+    } else if (iceTransportPolicyString == "relay") {
+      iceTransportPolicy = WebRTCIceTransportPolicy::kRelay;
+    } else {
+      DCHECK_EQ(iceTransportPolicyString, "all");
+    }
+  } else if (configuration.hasIceTransports()) {
+    UseCounter::count(context, UseCounter::RTCConfigurationIceTransports);
+    String iceTransportsString = configuration.iceTransports();
+    if (iceTransportsString == "none") {

[hta - Chromium, 2016/10/25 13:37:41]

Can you do these 2 translations of icetransportPolicy to
WebRTCIceTransportPolicy just once, using either a helper function or a loop?

If future specs add more values, we don't want to allow for the possibility that
these 2 translations diverge.

[foolip, 2016/10/25 15:43:04]

Done.

+      UseCounter::count(context, UseCounter::RTCConfigurationIceTransportsNone);
+      iceTransportPolicy = WebRTCIceTransportPolicy::kNone;
+    } else if (iceTransportsString == "relay") {
+      iceTransportPolicy = WebRTCIceTransportPolicy::kRelay;
+    } else {
+      DCHECK_EQ(iceTransportsString, "all");
+    }
   }
 
   WebRTCBundlePolicy bundlePolicy = WebRTCBundlePolicy::kBalanced;
   String bundlePolicyString = configuration.bundlePolicy();
   if (bundlePolicyString == "max-compat") {
     bundlePolicy = WebRTCBundlePolicy::kMaxCompat;
   } else if (bundlePolicyString == "max-bundle") {
     bundlePolicy = WebRTCBundlePolicy::kMaxBundle;
   } else {
     DCHECK_EQ(bundlePolicyString, "balanced");
   }
 
   // For the histogram value of "WebRTC.PeerConnection.SelectedRtcpMuxPolicy".
   *selectedRtcpMuxPolicy = RtcpMuxPolicyDefault;
   WebRTCRtcpMuxPolicy rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kNegotiate;
   if (configuration.hasRtcpMuxPolicy()) {
     String rtcpMuxPolicyString = configuration.rtcpMuxPolicy();
     if (rtcpMuxPolicyString == "require") {
       *selectedRtcpMuxPolicy = RtcpMuxPolicyRequire;
       rtcpMuxPolicy = WebRTCRtcpMuxPolicy::kRequire;
     } else {
       DCHECK_EQ(rtcpMuxPolicyString, "negotiate");
       *selectedRtcpMuxPolicy = RtcpMuxPolicyNegotiate;
     }
   }
 
   WebRTCConfiguration webConfiguration;
-  webConfiguration.iceTransports = iceTransports;
+  webConfiguration.iceTransportPolicy = iceTransportPolicy;
   webConfiguration.bundlePolicy = bundlePolicy;
   webConfiguration.rtcpMuxPolicy = rtcpMuxPolicy;
 
   if (configuration.hasIceServers()) {
     Vector<WebRTCIceServer> iceServers;
     for (const RTCIceServer& iceServer : configuration.iceServers()) {
       Vector<String> urlStrings;
       if (iceServer.hasURLs()) {
         UseCounter::count(context, UseCounter::RTCIceServerURLs);
         const StringOrStringSequence& urls = iceServer.urls();
@@ skipping 1177 matching lines @@
 DEFINE_TRACE(RTCPeerConnection) {
   visitor->trace(m_localStreams);
   visitor->trace(m_remoteStreams);
   visitor->trace(m_dispatchScheduledEventRunner);
   visitor->trace(m_scheduledEvents);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink