Split Dictionary's get and convert into DictionaryHelper.

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/mediastream/RTCPeerConnection.h"
 
 #include "bindings/core/v8/ArrayValue.h"
+#include "bindings/core/v8/DictionaryHelper.h"
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/VoidCallback.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "modules/mediastream/MediaConstraintsImpl.h"
@@ skipping 36 matching lines @@
 }
 
 } // namespace
 
 PassRefPtr<RTCConfiguration> RTCPeerConnection::parseConfiguration(const Dictionary& configuration, ExceptionState& exceptionState)
 {
     if (configuration.isUndefinedOrNull())
         return nullptr;
 
     ArrayValue iceServers;
-    bool ok = configuration.get("iceServers", iceServers);
+    bool ok = DictionaryHelper::get(configuration, "iceServers", iceServers);
     if (!ok || iceServers.isUndefinedOrNull()) {
         exceptionState.throwTypeError("Malformed RTCConfiguration");
         return nullptr;
     }
 
     size_t numberOfServers;
     ok = iceServers.length(numberOfServers);
     if (!ok) {
         exceptionState.throwTypeError("Malformed RTCConfiguration");
         return nullptr;
     }
 
     RefPtr<RTCConfiguration> rtcConfiguration = RTCConfiguration::create();
 
     for (size_t i = 0; i < numberOfServers; ++i) {
         Dictionary iceServer;
         ok = iceServers.get(i, iceServer);
         if (!ok) {
             exceptionState.throwTypeError("Malformed RTCIceServer");
             return nullptr;
         }
 
         Vector<String> names;
         iceServer.getOwnPropertyNames(names);
 
         Vector<String> urlStrings;
         if (names.contains("urls")) {
-            if (!iceServer.get("urls", urlStrings) || !urlStrings.size()) {
+            if (!DictionaryHelper::get(iceServer, "urls", urlStrings) || !urlStrings.size()) {
                 String urlString;
-                if (iceServer.get("urls", urlString)) {
+                if (DictionaryHelper::get(iceServer, "urls", urlString)) {
                     urlStrings.append(urlString);
                 } else {
                     exceptionState.throwTypeError("Malformed RTCIceServer");
                     return nullptr;
                 }
             }
         } else if (names.contains("url")) {
             String urlString;
-            if (iceServer.get("url", urlString)) {
+            if (DictionaryHelper::get(iceServer, "url", urlString)) {
                 urlStrings.append(urlString);
             } else {
                 exceptionState.throwTypeError("Malformed RTCIceServer");
                 return nullptr;
             }
         } else {
             exceptionState.throwTypeError("Malformed RTCIceServer");
             return nullptr;
         }
 
         String username, credential;
-        iceServer.get("username", username);
-        iceServer.get("credential", credential);
+        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 nullptr;
             }
 
             rtcConfiguration->appendServer(RTCIceServer::create(url, username, credential));
         }
@@ skipping 328 matching lines @@
     // FIXME: Add passing selector as part of the statsRequest.
     m_peerHandler->getStats(statsRequest.release());
 }
 
 RTCDataChannel* RTCPeerConnection::createDataChannel(String label, const Dictionary& options, ExceptionState& exceptionState)
 {
     if (throwExceptionIfSignalingStateClosed(m_signalingState, exceptionState))
         return nullptr;
 
     blink::WebRTCDataChannelInit init;
-    options.get("ordered", init.ordered);
-    options.get("negotiated", init.negotiated);
+    DictionaryHelper::get(options, "ordered", init.ordered);
+    DictionaryHelper::get(options, "negotiated", init.negotiated);
 
     unsigned short value = 0;
-    if (options.get("id", value))
+    if (DictionaryHelper::get(options, "id", value))
         init.id = value;
-    if (options.get("maxRetransmits", value))
+    if (DictionaryHelper::get(options, "maxRetransmits", value))
         init.maxRetransmits = value;
-    if (options.get("maxRetransmitTime", value))
+    if (DictionaryHelper::get(options, "maxRetransmitTime", value))
         init.maxRetransmitTime = value;
 
     String protocolString;
-    options.get("protocol", protocolString);
+    DictionaryHelper::get(options, "protocol", protocolString);
     init.protocol = protocolString;
 
     RTCDataChannel* channel = RTCDataChannel::create(executionContext(), this, m_peerHandler.get(), label, init, exceptionState);
     if (exceptionState.hadException())
         return nullptr;
     m_dataChannels.append(channel);
     return channel;
 }
 
 bool RTCPeerConnection::hasLocalStreamWithTrackId(const String& trackId)
@@ skipping 219 matching lines @@
     visitor->trace(m_localStreams);
     visitor->trace(m_remoteStreams);
     visitor->trace(m_dataChannels);
 #if ENABLE(OILPAN)
     visitor->trace(m_scheduledEvents);
 #endif
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace WebCore