Enable generation of local host candidate.

Source/modules/mediastream/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 85 matching lines @@
             iceTransports = RTCIceTransportsNone;
         } else if (iceTransportsString == "relay") {
             iceTransports = RTCIceTransportsRelay;
         } else if (iceTransportsString != "all") {
             exceptionState.throwTypeError("Malformed RTCIceTransports");
             return 0;
         }
     }
 
     ArrayValue iceServers;
-    bool ok = DictionaryHelper::get(configuration, "iceServers", iceServers);
-    if (!ok || iceServers.isUndefinedOrNull()) {
-        exceptionState.throwTypeError("Malformed RTCConfiguration");
-        return 0;
-    }
-
-    size_t numberOfServers;
-    ok = iceServers.length(numberOfServers);
-    if (!ok) {
-        exceptionState.throwTypeError("Malformed RTCConfiguration");
-        return 0;
+    size_t numberOfServers = 0;
+    bool createIceServerArray = true;
+    if (DictionaryHelper::get(configuration, "iceServers", iceServers)) {
+        if (!iceServers.length(numberOfServers)) {
+            exceptionState.throwTypeError("Malformed RTCConfiguration");
+            return 0;
+        }

[tommi (sloooow) - chröme, 2015/09/16 18:19:45]

do we need to check for numberOfServers==0 or do we want to create the server
array even if it's empty?

[guoweis_left_chromium, 2015/09/16 22:10:20]

for iceServers:[] case, we do want to create the server array, i.e. to signal
webrtc NOT to create local host candidate.

+    } else {
+        v8::Local<v8::Value> iceServersValue;
+        // Failed to parse iceServers as ArrayValue, try it as a scalar. If
+        // iceServers is not specified (get returns false) or specified as
+        // "undefined", treat it as the special case which RTCIceServerArray
+        // will not be created.
+        bool ok = (!DictionaryHelper::get(configuration, "iceServers", iceServersValue)
+            || iceServersValue->IsUndefined());
+        if (!ok) {
+            exceptionState.throwTypeError("Malformed RTCConfiguration");
+            return 0;
+        }
+        createIceServerArray = false;
     }
 
     RTCBundlePolicy bundlePolicy = RTCBundlePolicyBalanced;
     String bundlePolicyString;
     if (DictionaryHelper::get(configuration, "bundlePolicy", bundlePolicyString)) {
         if (bundlePolicyString == "max-compat") {
             bundlePolicy = RTCBundlePolicyMaxCompat;
         } else if (bundlePolicyString == "max-bundle") {
             bundlePolicy = RTCBundlePolicyMaxBundle;
         } else if (bundlePolicyString != "balanced") {
@@ skipping 10 matching lines @@
         } else if (rtcpMuxPolicyString != "negotiate") {
             exceptionState.throwTypeError("Malformed RTCRtcpMuxPolicy");
             return 0;
         }
     }
 
     RTCConfiguration* rtcConfiguration = RTCConfiguration::create();
     rtcConfiguration->setIceTransports(iceTransports);
     rtcConfiguration->setBundlePolicy(bundlePolicy);
     rtcConfiguration->setRtcpMuxPolicy(rtcpMuxPolicy);
+    if (createIceServerArray) {
+        rtcConfiguration->setIceServers(RTCIceServerArray::create());
+    }
 
     for (size_t i = 0; i < numberOfServers; ++i) {
         Dictionary iceServer;
-        ok = iceServers.get(i, iceServer);
+        bool ok = iceServers.get(i, iceServer);
         if (!ok) {
             exceptionState.throwTypeError("Malformed RTCIceServer");
             return 0;
         }
 
         Vector<String> names;
         iceServer.getPropertyNames(names);
 
         Vector<String> urlStrings;
         if (names.contains("urls")) {
@@ skipping 23 matching lines @@
         DictionaryHelper::get(iceServer, "username", username);
         DictionaryHelper::get(iceServer, "credential", credential);
 
         for (Vector<String>::iterator iter = urlStrings.begin(); iter != urlStrings.end(); ++iter) {
             KURL url(KURL(), *iter);
             if (!url.isValid() || !(url.protocolIs("turn") || url.protocolIs("turns") || url.protocolIs("stun"))) {
                 exceptionState.throwTypeError("Malformed URL");
                 return 0;
             }
 
-            rtcConfiguration->appendServer(RTCIceServer::create(url, username, credential));
+            rtcConfiguration->iceServers()->appendServer(RTCIceServer::create(url, username, credential));
         }
     }
 
     return rtcConfiguration;
 }
 
 RTCOfferOptions* RTCPeerConnection::parseOfferOptions(const Dictionary& options, ExceptionState& exceptionState)
 {
     if (options.isUndefinedOrNull())
         return 0;
@@ skipping 630 matching lines @@
 {
     visitor->trace(m_localStreams);
     visitor->trace(m_remoteStreams);
     visitor->trace(m_dataChannels);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<RTCPeerConnection>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink