<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169943] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169943">169943</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-13 12:35:05 -0700 (Fri, 13 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a HTTPHeaderMap::set overload that takes a HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133874
Reviewed by Tim Horton.
* platform/network/HTTPHeaderMap.cpp:
(WebCore::HTTPHeaderMap::set):
* platform/network/HTTPHeaderMap.h:
* platform/network/cf/ResourceRequestCFNet.cpp:
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
* platform/network/mac/ResourceRequestMac.mm:
(WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp">trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMaph">trunk/Source/WebCore/platform/network/HTTPHeaderMap.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp">trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceRequestMacmm">trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169942 => 169943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/ChangeLog 2014-06-13 19:35:05 UTC (rev 169943)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-06-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add a HTTPHeaderMap::set overload that takes a HTTPHeaderName
+ https://bugs.webkit.org/show_bug.cgi?id=133874
+
+ Reviewed by Tim Horton.
+
+ * platform/network/HTTPHeaderMap.cpp:
+ (WebCore::HTTPHeaderMap::set):
+ * platform/network/HTTPHeaderMap.h:
+ * platform/network/cf/ResourceRequestCFNet.cpp:
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ * platform/network/mac/ResourceRequestMac.mm:
+ (WebCore::ResourceRequest::doUpdatePlatformHTTPBody):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::send):
+
+2014-06-13 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add a HTTPHeaderMap::find overload that takes a HTTPHeaderName
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133872
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (169942 => 169943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp 2014-06-13 19:35:05 UTC (rev 169943)
</span><span class="lines">@@ -99,6 +99,11 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+void HTTPHeaderMap::set(HTTPHeaderName name, const String& value)
+{
+ m_headers.set(httpHeaderNameString(name).toStringWithoutCopying(), value);
+}
+
</ins><span class="cx"> bool HTTPHeaderMap::contains(HTTPHeaderName name) const
</span><span class="cx"> {
</span><span class="cx"> return m_headers.contains(httpHeaderNameString(name).toStringWithoutCopying());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.h (169942 => 169943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.h 2014-06-13 19:35:05 UTC (rev 169943)
</span><span class="lines">@@ -63,12 +63,15 @@
</span><span class="cx"> void set(const AtomicString& name, const String& value);
</span><span class="cx"> void add(const AtomicString& name, const String& value);
</span><span class="cx">
</span><ins>+ void set(HTTPHeaderName, const String& value);
</ins><span class="cx"> bool contains(HTTPHeaderName) const;
</span><span class="cx"> String get(const char*) const;
</span><span class="cx"> const_iterator find(HTTPHeaderName) const;
</span><span class="cx"> bool remove(HTTPHeaderName);
</span><span class="cx">
</span><span class="cx"> // Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
</span><ins>+ template<size_t length> void set(const char (&)[length], const String&) = delete;
+ template<size_t length> void add(const char (&)[length], const String&) = delete;
</ins><span class="cx"> template<size_t length> bool contains(const char (&)[length]) = delete;
</span><span class="cx"> template<size_t length> const_iterator find(const char(&)[length]) = delete;
</span><span class="cx"> template<size_t length> bool remove(const char (&)[length]) = delete;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceRequestCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp (169942 => 169943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp 2014-06-13 19:35:05 UTC (rev 169943)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceRequestCFNet.h"
</span><span class="cx">
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx">
</span><span class="lines">@@ -219,12 +220,11 @@
</span><span class="cx">
</span><span class="cx"> if (RetainPtr<CFReadStreamRef> bodyStream = adoptCF(CFURLRequestCopyHTTPRequestBodyStream(cfRequest))) {
</span><span class="cx"> // For streams, provide a Content-Length to avoid using chunked encoding, and to get accurate total length in callbacks.
</span><del>- RetainPtr<CFStringRef> lengthString = adoptCF(static_cast<CFStringRef>(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName())));
- if (lengthString) {
</del><ins>+ if (RetainPtr<CFStringRef> lengthString = adoptCF(static_cast<CFStringRef>(CFReadStreamCopyProperty(bodyStream.get(), formDataStreamLengthPropertyName())))) {
</ins><span class="cx"> CFURLRequestSetHTTPHeaderFieldValue(cfRequest, CFSTR("Content-Length"), lengthString.get());
</span><span class="cx"> // Since resource request is already marked updated, we need to keep it up to date too.
</span><span class="cx"> ASSERT(m_resourceRequestUpdated);
</span><del>- m_httpHeaderFields.set("Content-Length", lengthString.get());
</del><ins>+ m_httpHeaderFields.set(HTTPHeaderName::ContentLength, lengthString.get());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceRequestMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm (169942 => 169943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/platform/network/mac/ResourceRequestMac.mm 2014-06-13 19:35:05 UTC (rev 169943)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #import "ResourceRequest.h"
</span><span class="cx">
</span><span class="cx"> #import "FormDataStreamMac.h"
</span><ins>+#import "HTTPHeaderNames.h"
</ins><span class="cx"> #import "ResourceRequestCFNet.h"
</span><span class="cx"> #import "RuntimeApplicationChecks.h"
</span><span class="cx"> #import "WebCoreSystemInterface.h"
</span><span class="lines">@@ -235,7 +236,7 @@
</span><span class="cx"> [nsRequest setValue:lengthString forHTTPHeaderField:@"Content-Length"];
</span><span class="cx"> // Since resource request is already marked updated, we need to keep it up to date too.
</span><span class="cx"> ASSERT(m_resourceRequestUpdated);
</span><del>- m_httpHeaderFields.set("Content-Length", lengthString);
</del><ins>+ m_httpHeaderFields.set(HTTPHeaderName::ContentLength, lengthString);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (169942 => 169943)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-13 18:56:58 UTC (rev 169942)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-13 19:35:05 UTC (rev 169943)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "File.h"
</span><span class="cx"> #include "HTMLDocument.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "JSDOMBinding.h"
</span><span class="lines">@@ -632,7 +633,7 @@
</span><span class="cx"> setRequestHeaderInternal("Content-Type", "application/xml");
</span><span class="cx"> } else {
</span><span class="cx"> replaceCharsetInMediaType(contentType, "UTF-8");
</span><del>- m_requestHeaders.set("Content-Type", contentType);
</del><ins>+ m_requestHeaders.set(HTTPHeaderName::ContentType, contentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_requestEntityBody = FormData::create(UTF8Encoding().encode(body, EntitiesForUnencodables));
</span></span></pre>
</div>
</div>
</body>
</html>