Fix URLSearchParams to use the right encoding algorithm

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 "core/dom/DOMURL.h"
 #include "platform/network/FormDataEncoder.h"
 #include "platform/weborigin/KURL.h"
-#include "wtf/text/StringBuilder.h"
 #include "wtf/text/TextEncoding.h"
 
 namespace blink {
 
 namespace {
 
 class URLSearchParamsIterationSource final : public PairIterable<String, String>::IterationSource {
 public:
     URLSearchParamsIterationSource(Vector<std::pair<String, String>> params) : m_params(params), m_current(0) { }
 
@@ skipping 96 matching lines @@
                 value = decodeString(queryString.substring(endOfName + 1, nameValueEnd - endOfName - 1));
             if (value.isNull())
                 value = "";
             m_params.append(std::make_pair(name, value));
         }
         start = nameValueEnd + 1;
     }
     runUpdateSteps();
 }
 
-static String encodeString(const String& input)
-{
-    return encodeWithURLEscapeSequences(input).replace("%20", "+");
-}
-
 String URLSearchParams::toString() const
 {
-    StringBuilder result;
-    for (size_t i = 0; i < m_params.size(); ++i) {
-        if (i)
-            result.append('&');
-        result.append(encodeString(m_params[i].first));
-        result.append('=');
-        result.append(encodeString(m_params[i].second));
-    }
-    return result.toString();
+    Vector<char> encodedData;
+    encodeAsFormData(encodedData);
+    return String(encodedData.data(), encodedData.size());
 }
 
 void URLSearchParams::append(const String& name, const String& value)
 {
     m_params.append(std::make_pair(name, value));
     runUpdateSteps();
 }
 
 void URLSearchParams::deleteAllWithName(const String& name)
 {
@@ skipping 52 matching lines @@
             i++;
         }
     }
     // Otherwise, append a new name-value pair to the list.
     if (!foundMatch)
         append(name, value);
     else
         runUpdateSteps();
 }
 
-PassRefPtr<EncodedFormData> URLSearchParams::encodeFormData() const
+void URLSearchParams::encodeAsFormData(Vector<char>& encodedData) const
+{
+    for (const auto& param : m_params)
+        FormDataEncoder::addKeyValuePairAsFormData(encodedData, param.first.utf8(), param.second.utf8(), EncodedFormData::FormURLEncoded, FormDataEncoder::DoNotNormalizeCRLF);
+}
+
+PassRefPtr<EncodedFormData> URLSearchParams::toEncodedFormData() const
 {
     Vector<char> encodedData;
-    for (const auto& param : m_params)
-        FormDataEncoder::addKeyValuePairAsFormData(encodedData, param.first.utf8(), param.second.utf8(), EncodedFormData::FormURLEncoded);
+    encodeAsFormData(encodedData);
     return EncodedFormData::create(encodedData.data(), encodedData.size());
 }
 
 PairIterable<String, String>::IterationSource* URLSearchParams::startIteration(ScriptState*, ExceptionState&)
 {
     return new URLSearchParamsIterationSource(m_params);
 }
 
 } // namespace blink