Sync the XHR-related interfaces with the spec

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
@@ skipping 682 matching lines @@
     }
 
     // FIXME: According to XMLHttpRequest Level 2 we should throw InvalidAccessError exception here.
     // However for time being only print warning message to warn web developers.
     if (!m_async)
         UseCounter::countDeprecation(executionContext(), UseCounter::SyncXHRWithCredentials);
 
     m_includeCredentials = value;
 }
 
-void XMLHttpRequest::open(const AtomicString& method, const String& url, ExceptionState& exceptionState)
+void XMLHttpRequest::open(const AtomicString& method, const String& urlString, ExceptionState& exceptionState)
 {
-    open(method, url, true, exceptionState);
+    open(method, executionContext()->completeURL(urlString), true, exceptionState);
 }
 
-void XMLHttpRequest::open(const AtomicString& method, const String& urlString, bool async, ExceptionState& exceptionState)
+void XMLHttpRequest::open(const AtomicString& method, const String& urlString, bool async, const String& username, const String& password, ExceptionState& exceptionState)
 {
-    open(method, executionContext()->completeURL(urlString), async, exceptionState);
+    KURL url(executionContext()->completeURL(urlString));
+    if (!username.isNull())
+        url.setUser(username);
+    if (!password.isNull())
+        url.setPass(password);
+
+    open(method, url, async, exceptionState);
 }
 
 void XMLHttpRequest::open(const AtomicString& method, const KURL& url, bool async, ExceptionState& exceptionState)
 {
     WTF_LOG(Network, "XMLHttpRequest %p open('%s', '%s', %d)", this, method.utf8().data(), url.elidedString().utf8().data(), async);
 
     if (!internalAbort())
         return;
 
     State previousState = m_state;
@@ skipping 53 matching lines @@
     ASSERT(!m_loader);
 
     // Check previous state to avoid dispatching readyState event
     // when calling open several times in a row.
     if (previousState != OPENED)
         changeState(OPENED);
     else
         m_state = OPENED;
 }
 
-void XMLHttpRequest::open(const AtomicString& method, const String& urlString, bool async, const String& user, ExceptionState& exceptionState)
-{
-    KURL urlWithCredentials(executionContext()->completeURL(urlString));
-    if (!user.isNull())
-        urlWithCredentials.setUser(user);
-
-    open(method, urlWithCredentials, async, exceptionState);
-}
-
-void XMLHttpRequest::open(const AtomicString& method, const String& urlString, bool async, const String& user, const String& password, ExceptionState& exceptionState)
-{
-    KURL urlWithCredentials(executionContext()->completeURL(urlString));
-    if (!user.isNull())
-        urlWithCredentials.setUser(user);
-    if (!password.isNull())
-        urlWithCredentials.setPass(password);
-
-    open(method, urlWithCredentials, async, exceptionState);
-}
-
 bool XMLHttpRequest::initSend(ExceptionState& exceptionState)
 {
     if (!executionContext())
         return false;
 
     if (m_state != OPENED || m_loader) {
         exceptionState.throwDOMException(InvalidStateError, "The object's state must be OPENED.");
         return false;
     }
 
     m_error = false;
     return true;
 }
 
-void XMLHttpRequest::send(const ArrayBufferOrArrayBufferViewOrBlobOrDocumentOrStringOrFormData& data, ExceptionState& exceptionState)
+void XMLHttpRequest::send(const ArrayBufferOrArrayBufferViewOrBlobOrDocumentOrStringOrFormData& body, ExceptionState& exceptionState)
 {
-    if (data.isNull()) {
-        send(exceptionState);
+    InspectorInstrumentation::willSendXMLHttpRequest(executionContext(), url());
+
+    if (body.isNull()) {
+        send(String(), exceptionState);
         return;
     }
 
-    InspectorInstrumentation::willSendXMLHttpRequest(executionContext(), url());
-    if (data.isArrayBuffer()) {
-        send(data.getAsArrayBuffer().get(), exceptionState);
+    if (body.isArrayBuffer()) {
+        send(body.getAsArrayBuffer().get(), exceptionState);
         return;
     }
 
-    if (data.isArrayBufferView()) {
-        send(data.getAsArrayBufferView().get(), exceptionState);
+    if (body.isArrayBufferView()) {
+        send(body.getAsArrayBufferView().get(), exceptionState);
         return;
     }
 
-    if (data.isBlob()) {
-        send(data.getAsBlob(), exceptionState);
+    if (body.isBlob()) {
+        send(body.getAsBlob(), exceptionState);
         return;
     }
 
-    if (data.isDocument()) {
-        send(data.getAsDocument().get(), exceptionState);
+    if (body.isDocument()) {
+        send(body.getAsDocument().get(), exceptionState);
         return;
     }
 
-    if (data.isFormData()) {
-        send(data.getAsFormData(), exceptionState);
+    if (body.isFormData()) {
+        send(body.getAsFormData(), exceptionState);
         return;
     }
 
-    ASSERT(data.isString());
-    send(data.getAsString(), exceptionState);
-}
-
-void XMLHttpRequest::send(ExceptionState& exceptionState)
-{
-    InspectorInstrumentation::willSendXMLHttpRequest(executionContext(), url());
-    send(String(), exceptionState);
+    ASSERT(body.isString());
+    send(body.getAsString(), exceptionState);
 }
 
 bool XMLHttpRequest::areMethodAndURLValidForSend()
 {
     return m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily();
 }
 
 void XMLHttpRequest::send(Document* document, ExceptionState& exceptionState)
 {
     WTF_LOG(Network, "XMLHttpRequest %p send() Document %p", this, document);
@@ skipping 1014 matching lines @@
     visitor->trace(m_responseDocumentParser);
     visitor->trace(m_progressEventThrottle);
     visitor->trace(m_upload);
     visitor->trace(m_blobLoader);
     XMLHttpRequestEventTarget::trace(visitor);
     DocumentParserClient::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink