Support XMLHttpRequest.send(URLSearchParams)

third_party/WebKit/Source/core/xmlhttprequest/XMLHttpRequest.cpp

 /*
  *  Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  *  Copyright (C) 2005-2007 Alexey Proskuryakov <ap@webkit.org>
  *  Copyright (C) 2007, 2008 Julien Chaffraix <jchaffraix@webkit.org>
  *  Copyright (C) 2008, 2011 Google Inc. All rights reserved.
  *  Copyright (C) 2012 Intel Corporation
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
  *  version 2 of the License, or (at your option) any later version.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Lesser General Public License for more details.
  *
  *  You should have received a copy of the GNU Lesser General Public
  *  License along with this library; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301 USA
  */
 
 #include "core/xmlhttprequest/XMLHttpRequest.h"
 
-#include "bindings/core/v8/ArrayBufferOrArrayBufferViewOrBlobOrDocumentOrStringOrFormData.h"
+#include <memory>
+#include "bindings/core/v8/ArrayBufferOrArrayBufferViewOrBlobOrDocumentOrStringOrFormDataOrURLSearchParams.h"
 #include "bindings/core/v8/ArrayBufferOrArrayBufferViewOrBlobOrUSVString.h"
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/DOMImplementation.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/DocumentInit.h"
 #include "core/dom/DocumentParser.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
+#include "core/dom/URLSearchParams.h"
 #include "core/dom/XMLDocument.h"
 #include "core/editing/serializers/Serialization.h"
 #include "core/events/Event.h"
 #include "core/events/ProgressEvent.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/File.h"
 #include "core/fileapi/FileReaderLoader.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/Settings.h"
@@ skipping 24 matching lines @@
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/weborigin/SecurityPolicy.h"
 #include "platform/weborigin/Suborigin.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/Assertions.h"
 #include "wtf/AutoReset.h"
 #include "wtf/StdLibExtras.h"
 #include "wtf/text/CString.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 // This class protects the wrapper of the associated XMLHttpRequest object
 // via hasPendingActivity method which returns true if
 // m_eventDispatchRecursionLevel is positive.
 class ScopedEventDispatchProtect final {
  public:
@@ skipping 602 matching lines @@
       UseCounter::count(getExecutionContext(),
                         UseCounter::During_Microtask_SyncXHR);
     }
   }
 
   m_error = false;
   return true;
 }
 
 void XMLHttpRequest::send(
-    const ArrayBufferOrArrayBufferViewOrBlobOrDocumentOrStringOrFormData& body,
+    const ArrayBufferOrArrayBufferViewOrBlobOrDocumentOrStringOrFormDataOrURLSearchParams&
+        body,
     ExceptionState& exceptionState) {
   InspectorInstrumentation::willSendXMLHttpOrFetchNetworkRequest(
       getExecutionContext(), url());
 
   if (body.isNull()) {
     send(String(), exceptionState);
     return;
   }
 
   if (body.isArrayBuffer()) {
@@ skipping 14 matching lines @@
   if (body.isDocument()) {
     send(body.getAsDocument(), exceptionState);
     return;
   }
 
   if (body.isFormData()) {
     send(body.getAsFormData(), exceptionState);
     return;
   }
 
+  if (body.isURLSearchParams()) {
+    send(body.getAsURLSearchParams(), exceptionState);
+    return;
+  }
+
   DCHECK(body.isString());
   send(body.getAsString(), exceptionState);
 }
 
 bool XMLHttpRequest::areMethodAndURLValidForSend() {
   return m_method != HTTPNames::GET && m_method != HTTPNames::HEAD &&
          m_url.protocolIsInHTTPFamily();
 }
 
 void XMLHttpRequest::send(Document* document, ExceptionState& exceptionState) {
@@ skipping 99 matching lines @@
       AtomicString contentType =
           AtomicString("multipart/form-data; boundary=") +
           httpBody->boundary().data();
       setRequestHeaderInternal(HTTPNames::Content_Type, contentType);
     }
   }
 
   createRequest(std::move(httpBody), exceptionState);
 }
 
+void XMLHttpRequest::send(URLSearchParams* body,
+                          ExceptionState& exceptionState) {
+  NETWORK_DVLOG(1) << this << " send() URLSearchParams " << body;
+
+  if (!initSend(exceptionState))
+    return;
+
+  RefPtr<EncodedFormData> httpBody;
+
+  if (areMethodAndURLValidForSend()) {
+    httpBody = body->toEncodedFormData();
+
+    String contentType = getRequestHeader(HTTPNames::Content_Type);
+    if (contentType.isEmpty()) {
+      setRequestHeaderInternal(
+          HTTPNames::Content_Type,
+          "application/x-www-form-urlencoded;charset=UTF-8");
+    } else {
+      replaceCharsetInMediaType(contentType, "UTF-8");

[yhirano, 2017/03/01 02:21:00]

Can you tell me where this is from?

[sof, 2017/03/01 07:07:52]

Last para of step 4 in https://xhr.spec.whatwg.org/#the-send%28%29-method

[tyoshino (SeeGerritForStatus), 2017/03/01 09:04:58]

Can we factor this out? XMLHttpRequest::send(const String&, ...) has the same
logic.

[sof, 2017/03/01 09:49:14]

Oh yes, good suggestion; done + added a test.

+      m_requestHeaders.set(HTTPNames::Content_Type, AtomicString(contentType));
+    }
+  }
+
+  createRequest(std::move(httpBody), exceptionState);
+}
+
 void XMLHttpRequest::send(DOMArrayBuffer* body,
                           ExceptionState& exceptionState) {
   NETWORK_DVLOG(1) << this << " send() ArrayBuffer " << body;
 
   sendBytesData(body->data(), body->byteLength(), exceptionState);
 }
 
 void XMLHttpRequest::send(DOMArrayBufferView* body,
                           ExceptionState& exceptionState) {
   NETWORK_DVLOG(1) << this << " send() ArrayBufferView " << body;
@@ skipping 988 matching lines @@
   visitor->traceWrappers(m_responseDocument);
   visitor->traceWrappers(m_responseArrayBuffer);
   XMLHttpRequestEventTarget::traceWrappers(visitor);
 }
 
 std::ostream& operator<<(std::ostream& ostream, const XMLHttpRequest* xhr) {
   return ostream << "XMLHttpRequest " << static_cast<const void*>(xhr);
 }
 
 }  // namespace blink