Construct URLSearchParams from sequence initializer.

third_party/WebKit/Source/core/dom/URLSearchParams.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/dom/URLSearchParams.h"
 
+#include <utility>
 #include "core/dom/DOMURL.h"
 #include "platform/network/FormDataEncoder.h"
 #include "platform/weborigin/KURL.h"
 #include "wtf/text/TextEncoding.h"
 
 namespace blink {
 
 namespace {
 
 class URLSearchParamsIterationSource final
@@ skipping 15 matching lines @@
     return true;
   }
 
  private:
   Vector<std::pair<String, String>> m_params;
   size_t m_current;
 };
 
 }  // namespace
 
-URLSearchParams* URLSearchParams::create(const URLSearchParamsInit& init) {
+URLSearchParams* URLSearchParams::create(const URLSearchParamsInit& init,
+                                         ExceptionState& exceptionState) {
   if (init.isUSVString()) {
     const String& queryString = init.getAsUSVString();
     if (queryString.startsWith('?'))
       return new URLSearchParams(queryString.substring(1));
     return new URLSearchParams(queryString);
   }
+  // TODO(sof): copy constructor no longer in the spec,
+  // consider removing.
   if (init.isURLSearchParams())
     return new URLSearchParams(init.getAsURLSearchParams());
 
+  if (init.isUSVStringSequenceSequence()) {
+    return URLSearchParams::create(init.getAsUSVStringSequenceSequence(),
+                                   exceptionState);
+  }
+
   DCHECK(init.isNull());
   return new URLSearchParams(String());
 }
 
+URLSearchParams* URLSearchParams::create(const Vector<Vector<String>>& init,
+                                         ExceptionState& exceptionState) {
+  URLSearchParams* instance = new URLSearchParams(String());
+  for (unsigned i = 0; i < init.size(); ++i) {
+    const Vector<String>& pair = init[i];
+    if (pair.size() != 2) {
+      exceptionState.throwTypeError(ExceptionMessages::failedToConstruct(
+          "URLSearchParams",
+          "Sequence initializer must only contain pair elements"));
+      return nullptr;
+    }
+    instance->appendWithoutUpdate(pair[0], pair[1]);
+  }
+  if (init.size())
+    instance->runUpdateSteps();

[tyoshino (SeeGerritForStatus), 2017/03/01 08:57:06]

optional: we can also early return before the for-loop.

[sof, 2017/03/01 09:06:09]

ok, consistent style to do so.

+  return instance;
+}
+
 URLSearchParams::URLSearchParams(const String& queryString, DOMURL* urlObject)
     : m_urlObject(urlObject) {
   if (!queryString.isEmpty())
     setInput(queryString);
 }
 
 URLSearchParams::URLSearchParams(URLSearchParams* searchParams) {
   DCHECK(searchParams);
   m_params = searchParams->m_params;
 }
@@ skipping 39 matching lines @@
       if (endOfName == kNotFound || endOfName > nameValueEnd)
         endOfName = nameValueEnd;
       String name =
           decodeString(queryString.substring(nameStart, endOfName - nameStart));
       String value;
       if (endOfName != nameValueEnd)
         value = decodeString(
             queryString.substring(endOfName + 1, nameValueEnd - endOfName - 1));
       if (value.isNull())
         value = "";
-      m_params.push_back(std::make_pair(name, value));
+      appendWithoutUpdate(name, value);
     }
     start = nameValueEnd + 1;
   }
   runUpdateSteps();
 }
 
 String URLSearchParams::toString() const {
   Vector<char> encodedData;
   encodeAsFormData(encodedData);
   return String(encodedData.data(), encodedData.size());
 }
 
+void URLSearchParams::appendWithoutUpdate(const String& name,
+                                          const String& value) {
+  m_params.push_back(std::make_pair(name, value));
+}
+
 void URLSearchParams::append(const String& name, const String& value) {
-  m_params.push_back(std::make_pair(name, value));
+  appendWithoutUpdate(name, value);
   runUpdateSteps();
 }
 
 void URLSearchParams::deleteAllWithName(const String& name) {
   for (size_t i = 0; i < m_params.size();) {
     if (m_params[i].first == name)
       m_params.remove(i);
     else
       i++;
   }
@@ skipping 62 matching lines @@
   return EncodedFormData::create(encodedData.data(), encodedData.size());
 }
 
 PairIterable<String, String>::IterationSource* URLSearchParams::startIteration(
     ScriptState*,
     ExceptionState&) {
   return new URLSearchParamsIterationSource(m_params);
 }
 
 }  // namespace blink