Changeset 169906 in webkit

Timestamp:

Jun 12, 2014, 12:50:56 PM (12 years ago)

Author:

andersca@apple.com

Message:

Move header value merging to HTTPHeaderMap
​https://bugs.webkit.org/show_bug.cgi?id=133815

Reviewed by Andreas Kling.

• platform/network/HTTPHeaderMap.cpp:

(WebCore::HTTPHeaderMap::set):
(WebCore::HTTPHeaderMap::add):

• platform/network/HTTPHeaderMap.h:
• platform/network/ResourceRequestBase.cpp:

(WebCore::ResourceRequestBase::addHTTPHeaderField):

• platform/network/ResourceResponseBase.cpp:

(WebCore::ResourceResponseBase::addHTTPHeaderField):

• xml/XMLHttpRequest.cpp:

(WebCore::XMLHttpRequest::setRequestHeaderInternal):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/HTTPHeaderMap.cpp (modified) (2 diffs)
• platform/network/HTTPHeaderMap.h (modified) (3 diffs)
• platform/network/ResourceRequestBase.cpp (modified) (1 diff)
• platform/network/ResourceResponseBase.cpp (modified) (1 diff)
• xml/XMLHttpRequest.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-12  Anders Carlsson  <andersca@apple.com>
+
+        Move header value merging to HTTPHeaderMap
+        https://bugs.webkit.org/show_bug.cgi?id=133815
+
+        Reviewed by Andreas Kling.
+
+        * platform/network/HTTPHeaderMap.cpp:
+        (WebCore::HTTPHeaderMap::set):
+        (WebCore::HTTPHeaderMap::add):
+        * platform/network/HTTPHeaderMap.h:
+        * platform/network/ResourceRequestBase.cpp:
+        (WebCore::ResourceRequestBase::addHTTPHeaderField):
+        * platform/network/ResourceResponseBase.cpp:
+        (WebCore::ResourceResponseBase::addHTTPHeaderField):
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::setRequestHeaderInternal):
+
 2014-06-12  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp

@@ -68 +68 @@
 }
 
-HTTPHeaderMap::AddResult HTTPHeaderMap::set(const AtomicString& name, const String& value)
+void HTTPHeaderMap::set(const AtomicString& name, const String& value)
 {
-    return m_headers.set(name, value);
+    m_headers.set(name, value);
 }
 
-HTTPHeaderMap::AddResult HTTPHeaderMap::add(const AtomicString& name, const String& value)
+void HTTPHeaderMap::add(const AtomicString& name, const String& value)
 {
-    return m_headers.add(name, value);
+    auto result = m_headers.add(name, value);
+    if (!result.isNewEntry)
+        result.iterator->value = result.iterator->value + ',' + value;
 }
 
@@ -114 +116 @@
 }
 
-HTTPHeaderMap::AddResult HTTPHeaderMap::add(const char* name, const String& value)
-{
-    return m_headers.add<CaseFoldingCStringTranslator>(name, value);
-}
-
 bool HTTPHeaderMap::remove(const char* name)
 {

trunk/Source/WebCore/platform/network/HTTPHeaderMap.h

@@ -45 +45 @@
 public:
     typedef HashMapType::const_iterator const_iterator;
-    typedef HashMapType::AddResult AddResult;
 
     HTTPHeaderMap();
@@ -61 +60 @@
     String get(const AtomicString& name) const;
 
-    AddResult set(const AtomicString& name, const String& value);
-    AddResult add(const AtomicString& name, const String& value);
+    void set(const AtomicString& name, const String& value);
+    void add(const AtomicString& name, const String& value);
 
     // Alternate accessors that are faster than converting the char* to AtomicString first.
@@ -68 +67 @@
     String get(const char*) const;
     const_iterator find(const char*) const;
-    AddResult add(const char* name, const String& value);
     bool remove(const char*);
 

trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp

@@ -451 +451 @@
 {
     updateResourceRequest();
-    HTTPHeaderMap::AddResult result = m_httpHeaderFields.add(name, value);
-    if (!result.isNewEntry)
-        result.iterator->value = result.iterator->value + ',' + value;
+
+    m_httpHeaderFields.add(name, value);
 
     if (url().protocolIsInHTTPFamily())

trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp

@@ -324 +324 @@
     updateHeaderParsedState(name);
 
-    HTTPHeaderMap::AddResult result = m_httpHeaderFields.add(name, value);
-    if (!result.isNewEntry)
-        result.iterator->value = result.iterator->value + ", " + value;
+    m_httpHeaderFields.add(name, value);
 }
 

trunk/Source/WebCore/xml/XMLHttpRequest.cpp

@@ -948 +948 @@
 void XMLHttpRequest::setRequestHeaderInternal(const AtomicString& name, const String& value)
 {
-    HTTPHeaderMap::AddResult result = m_requestHeaders.add(name, value);
-    if (!result.isNewEntry)
-        result.iterator->value = result.iterator->value + ", " + value;
+    m_requestHeaders.add(name, value);
 }