Changeset 192680 in webkit

Timestamp:

Nov 20, 2015, 1:25:56 AM (10 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

Use HTTPHeaderName as much as possible in XMLHttpRequest
​https://bugs.webkit.org/show_bug.cgi?id=151438

Reviewed by Darin Adler.

Removing XMLHttpRequest::setRequestHeaderInternal and XMLHttpRequest::getRequestHeader.
Using directly HTTPHeaderMap.add, HTTPHeaderMap.set and HTTPHeaderMap.get.

No change in behavior.

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::send):
(WebCore::XMLHttpRequest::setRequestHeader):
(WebCore::XMLHttpRequest::getAllResponseHeaders):

• xml/XMLHttpRequest.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• xml/XMLHttpRequest.cpp (modified) (5 diffs)
• xml/XMLHttpRequest.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-11-20  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        Use HTTPHeaderName as much as possible in XMLHttpRequest
+        https://bugs.webkit.org/show_bug.cgi?id=151438
+
+        Reviewed by Darin Adler.
+
+        Removing XMLHttpRequest::setRequestHeaderInternal and XMLHttpRequest::getRequestHeader.
+        Using directly HTTPHeaderMap.add, HTTPHeaderMap.set and HTTPHeaderMap.get.
+
+        No change in behavior.
+
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::send):
+        (WebCore::XMLHttpRequest::setRequestHeader):
+        (WebCore::XMLHttpRequest::getAllResponseHeaders):
+        * xml/XMLHttpRequest.h:
+
 2015-11-20  Eric Carlson  <eric.carlson@apple.com>
 

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -596 +596 @@
 #if ENABLE(DASHBOARD_SUPPORT)
             if (usesDashboardBackwardCompatibilityMode())
-                setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
+                m_requestHeaders.set(HTTPHeaderName::ContentType, ASCIILiteral("application/x-www-form-urlencoded"));
             else
 #endif
                 // FIXME: this should include the charset used for encoding.
-                setRequestHeaderInternal("Content-Type", document->isHTMLDocument() ? "text/html;charset=UTF-8":"application/xml;charset=UTF-8");
+                m_requestHeaders.set(HTTPHeaderName::ContentType, document->isHTMLDocument() ? ASCIILiteral("text/html;charset=UTF-8") : ASCIILiteral("application/xml;charset=UTF-8"));
         }
 
@@ -621 +621 @@
 
     if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
-        String contentType = getRequestHeader("Content-Type");
+        String contentType = m_requestHeaders.get(HTTPHeaderName::ContentType);
         if (contentType.isNull()) {
 #if ENABLE(DASHBOARD_SUPPORT)
             if (usesDashboardBackwardCompatibilityMode())
-                setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
+                m_requestHeaders.set(HTTPHeaderName::ContentType, ASCIILiteral("application/x-www-form-urlencoded"));
             else
 #endif
-                setRequestHeaderInternal("Content-Type", "text/plain;charset=UTF-8");
+                m_requestHeaders.set(HTTPHeaderName::ContentType, ASCIILiteral("text/plain;charset=UTF-8"));
         } else {
             replaceCharsetInMediaType(contentType, "UTF-8");
@@ -651 +651 @@
             const String& blobType = body->type();
             if (!blobType.isEmpty() && isValidContentType(blobType))
-                setRequestHeaderInternal("Content-Type", blobType);
+                m_requestHeaders.set(HTTPHeaderName::ContentType, blobType);
             else {
                 // From FileAPI spec, whenever media type cannot be determined, empty string must be returned.
-                setRequestHeaderInternal("Content-Type", "");
+                m_requestHeaders.set(HTTPHeaderName::ContentType, emptyString());
             }
         }
@@ -676 +676 @@
 
         if (!m_requestHeaders.contains(HTTPHeaderName::ContentType))
-            setRequestHeaderInternal("Content-Type", makeString("multipart/form-data; boundary=", m_requestEntityBody->boundary().data()));
+            m_requestHeaders.set(HTTPHeaderName::ContentType, makeString("multipart/form-data; boundary=", m_requestEntityBody->boundary().data()));
     }
 
@@ -956 +956 @@
     }
 
-    setRequestHeaderInternal(name, normalizedValue);
-}
-
-void XMLHttpRequest::setRequestHeaderInternal(const String& name, const String& value)
-{
-    m_requestHeaders.add(name, value);
-}
-
-String XMLHttpRequest::getRequestHeader(const String& name) const
-{
-    return m_requestHeaders.get(name);
+    m_requestHeaders.add(name, normalizedValue);
 }
 

trunk/Source/WebCore/xml/XMLHttpRequest.h

@@ -177 +177 @@
     void sendBytesData(const void*, size_t, ExceptionCode&);
 
-    String getRequestHeader(const String& name) const;
-    void setRequestHeaderInternal(const String& name, const String& value);
-
     void changeState(State newState);
     void callReadyStateChangeListener();