<!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>[169974] 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/169974">169974</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-14 10:49:44 -0700 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a ResourceRequestBase::setHTTPHeaderField overload that takes a HTTPHeaderName
https://bugs.webkit.org/show_bug.cgi?id=133881
Reviewed by Sam Weinig.
* WebCore.exp.in:
* fileapi/FileReaderLoader.cpp:
(WebCore::FileReaderLoader::start):
* inspector/InspectorResourceAgent.cpp:
(WebCore::InspectorResourceAgent::willSendRequest):
* loader/CrossOriginAccessControl.cpp:
(WebCore::createAccessControlPreflightRequest):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::addExtraFieldsToRequest):
* loader/PingLoader.cpp:
(WebCore::PingLoader::loadImage):
(WebCore::PingLoader::sendPing):
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::createResourceHandle):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* page/EventSource.cpp:
(WebCore::EventSource::connect):
* platform/network/BlobResourceHandle.cpp:
(WebCore::BlobResourceHandle::doStart):
* platform/network/HTTPHeaderNames.in:
* platform/network/ResourceRequestBase.cpp:
(WebCore::ResourceRequestBase::httpHeaderField):
(WebCore::ResourceRequestBase::setHTTPHeaderField):
(WebCore::ResourceRequestBase::httpContentType):
(WebCore::ResourceRequestBase::setHTTPContentType):
(WebCore::ResourceRequestBase::httpReferrer):
(WebCore::ResourceRequestBase::setHTTPReferrer):
(WebCore::ResourceRequestBase::httpOrigin):
(WebCore::ResourceRequestBase::setHTTPOrigin):
(WebCore::ResourceRequestBase::httpUserAgent):
(WebCore::ResourceRequestBase::setHTTPUserAgent):
(WebCore::ResourceRequestBase::httpAccept):
(WebCore::ResourceRequestBase::setHTTPAccept):
* platform/network/ResourceRequestBase.h:
* platform/network/mac/ResourceHandleMac.mm:
(WebCore::ResourceHandle::willSendRequest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderLoadercpp">trunk/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginAccessControlcpp">trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderFrameLoadercpp">trunk/Source/WebCore/loader/FrameLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPingLoadercpp">trunk/Source/WebCore/loader/PingLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp">trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm">trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/ChangeLog 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2014-06-13 Anders Carlsson <andersca@apple.com>
+
+ Add a ResourceRequestBase::setHTTPHeaderField overload that takes a HTTPHeaderName
+ https://bugs.webkit.org/show_bug.cgi?id=133881
+
+ Reviewed by Sam Weinig.
+
+ * WebCore.exp.in:
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::start):
+ * inspector/InspectorResourceAgent.cpp:
+ (WebCore::InspectorResourceAgent::willSendRequest):
+ * loader/CrossOriginAccessControl.cpp:
+ (WebCore::createAccessControlPreflightRequest):
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::addExtraFieldsToRequest):
+ * loader/PingLoader.cpp:
+ (WebCore::PingLoader::loadImage):
+ (WebCore::PingLoader::sendPing):
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::createResourceHandle):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * page/EventSource.cpp:
+ (WebCore::EventSource::connect):
+ * platform/network/BlobResourceHandle.cpp:
+ (WebCore::BlobResourceHandle::doStart):
+ * platform/network/HTTPHeaderNames.in:
+ * platform/network/ResourceRequestBase.cpp:
+ (WebCore::ResourceRequestBase::httpHeaderField):
+ (WebCore::ResourceRequestBase::setHTTPHeaderField):
+ (WebCore::ResourceRequestBase::httpContentType):
+ (WebCore::ResourceRequestBase::setHTTPContentType):
+ (WebCore::ResourceRequestBase::httpReferrer):
+ (WebCore::ResourceRequestBase::setHTTPReferrer):
+ (WebCore::ResourceRequestBase::httpOrigin):
+ (WebCore::ResourceRequestBase::setHTTPOrigin):
+ (WebCore::ResourceRequestBase::httpUserAgent):
+ (WebCore::ResourceRequestBase::setHTTPUserAgent):
+ (WebCore::ResourceRequestBase::httpAccept):
+ (WebCore::ResourceRequestBase::setHTTPAccept):
+ * platform/network/ResourceRequestBase.h:
+ * platform/network/mac/ResourceHandleMac.mm:
+ (WebCore::ResourceHandle::willSendRequest):
+
</ins><span class="cx"> 2014-06-14 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Masks disappear when layers become tiled
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -818,7 +818,6 @@
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
</span><del>-__ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldEPKcRKN3WTF6StringE
</del><span class="cx"> __ZN7WebCore19ResourceRequestBase19addHTTPHeaderFieldsERKNS_13HTTPHeaderMapE
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase22defaultTimeoutIntervalEv
</span><span class="cx"> __ZN7WebCore19ResourceRequestBase24s_defaultTimeoutIntervalE
</span><span class="lines">@@ -1785,7 +1784,6 @@
</span><span class="cx"> __ZNK7WebCore19MediaSessionManager30applicationWillEnterBackgroundEv
</span><span class="cx"> __ZNK7WebCore19MediaSessionManager30applicationWillEnterForegroundEv
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase10httpMethodEv
</span><del>-__ZNK7WebCore19ResourceRequestBase15httpHeaderFieldEPKc
</del><span class="cx"> __ZNK7WebCore19ResourceRequestBase20firstPartyForCookiesEv
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase3urlEv
</span><span class="cx"> __ZNK7WebCore19ResourceRequestBase6isNullEv
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include "Blob.h"
</span><span class="cx"> #include "BlobURL.h"
</span><span class="cx"> #include "FileReaderLoaderClient.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="lines">@@ -88,7 +89,7 @@
</span><span class="cx"> ResourceRequest request(m_urlForReading);
</span><span class="cx"> request.setHTTPMethod("GET");
</span><span class="cx"> if (m_hasRange)
</span><del>- request.setHTTPHeaderField("Range", String::format("bytes=%d-%d", m_rangeStart, m_rangeEnd));
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Range, String::format("bytes=%d-%d", m_rangeStart, m_rangeEnd));
</ins><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><span class="cx"> options.sendLoadCallbacks = SendCallbacks;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "HTTPHeaderMap.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "IconController.h"
</span><span class="cx"> #include "InspectorClient.h"
</span><span class="cx"> #include "InspectorPageAgent.h"
</span><span class="lines">@@ -311,9 +312,9 @@
</span><span class="cx"> request.setReportRawHeaders(true);
</span><span class="cx">
</span><span class="cx"> if (m_cacheDisabled) {
</span><del>- request.setHTTPHeaderField("Pragma", "no-cache");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
</ins><span class="cx"> request.setCachePolicy(ReloadIgnoringCacheData);
</span><del>- request.setHTTPHeaderField("Cache-Control", "no-cache");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Inspector::TypeBuilder::Page::ResourceType::Enum resourceType = InspectorPageAgent::resourceTypeJson(type);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginAccessControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "CrossOriginAccessControl.h"
</span><span class="cx">
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "ResourceRequest.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="lines">@@ -107,7 +108,7 @@
</span><span class="cx"> ResourceRequest preflightRequest(request.url());
</span><span class="cx"> updateRequestForAccessControl(preflightRequest, securityOrigin, DoNotAllowStoredCredentials);
</span><span class="cx"> preflightRequest.setHTTPMethod("OPTIONS");
</span><del>- preflightRequest.setHTTPHeaderField("Access-Control-Request-Method", request.httpMethod());
</del><ins>+ preflightRequest.setHTTPHeaderField(HTTPHeaderName::AccessControlRequestMethod, request.httpMethod());
</ins><span class="cx"> preflightRequest.setPriority(request.priority());
</span><span class="cx">
</span><span class="cx"> const HTTPHeaderMap& requestHeaderFields = request.httpHeaderFields();
</span><span class="lines">@@ -125,7 +126,7 @@
</span><span class="cx"> headerBuffer.append(headerField.key);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", headerBuffer.toString().lower());
</del><ins>+ preflightRequest.setHTTPHeaderField(HTTPHeaderName::AccessControlRequestHeaders, headerBuffer.toString().lower());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return preflightRequest;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderFrameLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/FrameLoader.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include "HTMLObjectElement.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "HistoryController.h"
</span><span class="cx"> #include "HistoryItem.h"
</span><span class="lines">@@ -2564,10 +2565,10 @@
</span><span class="cx">
</span><span class="cx"> if (request.cachePolicy() == ReloadIgnoringCacheData) {
</span><span class="cx"> if (loadType == FrameLoadTypeReload)
</span><del>- request.setHTTPHeaderField("Cache-Control", "max-age=0");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
</ins><span class="cx"> else if (loadType == FrameLoadTypeReloadFromOrigin) {
</span><del>- request.setHTTPHeaderField("Cache-Control", "no-cache");
- request.setHTTPHeaderField("Pragma", "no-cache");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
+ request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPingLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PingLoader.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PingLoader.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/loader/PingLoader.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "ProgressTracker.h"
</span><span class="lines">@@ -57,7 +58,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(url);
</span><del>- request.setHTTPHeaderField("Cache-Control", "max-age=0");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
</ins><span class="cx"> String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), request.url(), frame.loader().outgoingReferrer());
</span><span class="cx"> if (!referrer.isEmpty())
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span><span class="lines">@@ -73,15 +74,15 @@
</span><span class="cx"> request.setHTTPMethod("POST");
</span><span class="cx"> request.setHTTPContentType("text/ping");
</span><span class="cx"> request.setHTTPBody(FormData::create("PING"));
</span><del>- request.setHTTPHeaderField("Cache-Control", "max-age=0");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
</ins><span class="cx"> frame.loader().addExtraFieldsToSubresourceRequest(request);
</span><span class="cx">
</span><span class="cx"> SecurityOrigin* sourceOrigin = frame.document()->securityOrigin();
</span><span class="cx"> RefPtr<SecurityOrigin> pingOrigin = SecurityOrigin::create(pingURL);
</span><span class="cx"> FrameLoader::addHTTPOriginIfNeeded(request, sourceOrigin->toString());
</span><del>- request.setHTTPHeaderField("Ping-To", destinationURL);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::PingTo, destinationURL);
</ins><span class="cx"> if (!SecurityPolicy::shouldHideReferrer(pingURL, frame.loader().outgoingReferrer())) {
</span><del>- request.setHTTPHeaderField("Ping-From", frame.document()->url());
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::PingFrom, frame.document()->url());
</ins><span class="cx"> if (!sourceOrigin->isSameSchemeHostPort(pingOrigin.get())) {
</span><span class="cx"> String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), pingURL, frame.loader().outgoingReferrer());
</span><span class="cx"> if (!referrer.isEmpty())
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "ManifestParser.h"
</span><span class="cx"> #include "Page.h"
</span><span class="lines">@@ -480,16 +481,16 @@
</span><span class="cx"> {
</span><span class="cx"> ResourceRequest request(url);
</span><span class="cx"> m_frame->loader().applyUserAgent(request);
</span><del>- request.setHTTPHeaderField("Cache-Control", "max-age=0");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
</ins><span class="cx">
</span><span class="cx"> if (newestCachedResource) {
</span><span class="cx"> const String& lastModified = newestCachedResource->response().httpHeaderField("Last-Modified");
</span><span class="cx"> const String& eTag = newestCachedResource->response().httpHeaderField("ETag");
</span><span class="cx"> if (!lastModified.isEmpty() || !eTag.isEmpty()) {
</span><span class="cx"> if (!lastModified.isEmpty())
</span><del>- request.setHTTPHeaderField("If-Modified-Since", lastModified);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
</ins><span class="cx"> if (!eTag.isEmpty())
</span><del>- request.setHTTPHeaderField("If-None-Match", eTag);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "FrameLoader.h"
</span><span class="cx"> #include "FrameLoaderClient.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "InspectorInstrumentation.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "LoaderStrategy.h"
</span><span class="lines">@@ -287,17 +288,17 @@
</span><span class="cx"> if (!lastModified.isEmpty() || !eTag.isEmpty()) {
</span><span class="cx"> ASSERT(cachedResourceLoader->cachePolicy(type()) != CachePolicyReload);
</span><span class="cx"> if (cachedResourceLoader->cachePolicy(type()) == CachePolicyRevalidate)
</span><del>- m_resourceRequest.setHTTPHeaderField("Cache-Control", "max-age=0");
</del><ins>+ m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
</ins><span class="cx"> if (!lastModified.isEmpty())
</span><del>- m_resourceRequest.setHTTPHeaderField("If-Modified-Since", lastModified);
</del><ins>+ m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
</ins><span class="cx"> if (!eTag.isEmpty())
</span><del>- m_resourceRequest.setHTTPHeaderField("If-None-Match", eTag);
</del><ins>+ m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(LINK_PREFETCH)
</span><span class="cx"> if (type() == CachedResource::LinkPrefetch || type() == CachedResource::LinkSubresource)
</span><del>- m_resourceRequest.setHTTPHeaderField("Purpose", "prefetch");
</del><ins>+ m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::Purpose, "prefetch");
</ins><span class="cx"> #endif
</span><span class="cx"> m_resourceRequest.setPriority(loadPriority());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/page/EventSource.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "EventException.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Frame.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "MessageEvent.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="lines">@@ -119,10 +120,10 @@
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(m_url);
</span><span class="cx"> request.setHTTPMethod("GET");
</span><del>- request.setHTTPHeaderField("Accept", "text/event-stream");
- request.setHTTPHeaderField("Cache-Control", "no-cache");
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream");
+ request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
</ins><span class="cx"> if (!m_lastEventId.isEmpty())
</span><del>- request.setHTTPHeaderField("Last-Event-ID", m_lastEventId);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::LastEventID, m_lastEventId);
</ins><span class="cx">
</span><span class="cx"> SecurityOrigin* origin = scriptExecutionContext()->securityOrigin();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobResourceHandlecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> #include "BlobData.h"
</span><span class="cx"> #include "FileStream.h"
</span><span class="cx"> #include "FileSystem.h"
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "URL.h"
</span><span class="cx"> #include "ResourceError.h"
</span><span class="lines">@@ -236,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Parse the "Range" header we care about.
</span><del>- String range = firstRequest().httpHeaderField("Range");
</del><ins>+ String range = firstRequest().httpHeaderField(HTTPHeaderName::Range);
</ins><span class="cx"> if (!range.isEmpty() && !parseRange(range, m_rangeOffset, m_rangeEnd, m_rangeSuffixLength)) {
</span><span class="cx"> m_errorCode = rangeError;
</span><span class="cx"> notifyResponse();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -24,21 +24,33 @@
</span><span class="cx"> //
</span><span class="cx">
</span><span class="cx"> Accept
</span><ins>+Access-Control-Request-Headers
+Access-Control-Request-Method
</ins><span class="cx"> Authorization
</span><ins>+Cache-Control
</ins><span class="cx"> Connection
</span><span class="cx"> Content-Length
</span><span class="cx"> Content-Type
</span><ins>+Host
</ins><span class="cx"> If-Match
</span><span class="cx"> If-Modified-Since
</span><span class="cx"> If-None-Match
</span><span class="cx"> If-Range
</span><span class="cx"> If-Unmodified-Since
</span><ins>+Last-Event-ID
</ins><span class="cx"> Location
</span><span class="cx"> Origin
</span><ins>+Ping-From
+Ping-To
+Purpose
+Pragma
+Range
</ins><span class="cx"> Referer
</span><span class="cx"> Sec-WebSocket-Accept
</span><ins>+Sec-WebSocket-Extensions
</ins><span class="cx"> Sec-WebSocket-Key
</span><span class="cx"> Sec-WebSocket-Protocol
</span><ins>+Sec-WebSocket-Version
</ins><span class="cx"> Set-Cookie
</span><span class="cx"> Set-Cookie2
</span><span class="cx"> Upgrade
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> return m_httpHeaderFields.get(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String ResourceRequestBase::httpHeaderField(const char* name) const
</del><ins>+String ResourceRequestBase::httpHeaderField(HTTPHeaderName name) const
</ins><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span><span class="cx">
</span><span class="lines">@@ -248,17 +248,22 @@
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setHTTPHeaderField(const AtomicString& name, const String& value)
</span><span class="cx"> {
</span><del>- updateResourceRequest();
</del><ins>+ updateResourceRequest();
+
+ m_httpHeaderFields.set(name, value);
</ins><span class="cx">
</span><del>- m_httpHeaderFields.set(name, value);
-
</del><span class="cx"> if (url().protocolIsInHTTPFamily())
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceRequestBase::setHTTPHeaderField(const char* name, const String& value)
</del><ins>+void ResourceRequestBase::setHTTPHeaderField(HTTPHeaderName name, const String& value)
</ins><span class="cx"> {
</span><del>- setHTTPHeaderField(AtomicString(name), value);
</del><ins>+ updateResourceRequest();
+
+ m_httpHeaderFields.set(name, value);
+
+ if (url().protocolIsInHTTPFamily())
+ m_platformRequestUpdated = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::clearHTTPAuthorization()
</span><span class="lines">@@ -274,12 +279,12 @@
</span><span class="cx">
</span><span class="cx"> String ResourceRequestBase::httpContentType() const
</span><span class="cx"> {
</span><del>- return httpHeaderField("Content-Type");
</del><ins>+ return httpHeaderField(HTTPHeaderName::ContentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setHTTPContentType(const String& httpContentType)
</span><span class="cx"> {
</span><del>- setHTTPHeaderField("Content-Type", httpContentType);
</del><ins>+ setHTTPHeaderField(HTTPHeaderName::ContentType, httpContentType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::clearHTTPContentType()
</span><span class="lines">@@ -294,12 +299,12 @@
</span><span class="cx">
</span><span class="cx"> String ResourceRequestBase::httpReferrer() const
</span><span class="cx"> {
</span><del>- return httpHeaderField("Referer");
</del><ins>+ return httpHeaderField(HTTPHeaderName::Referer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setHTTPReferrer(const String& httpReferrer)
</span><span class="cx"> {
</span><del>- setHTTPHeaderField("Referer", httpReferrer);
</del><ins>+ setHTTPHeaderField(HTTPHeaderName::Referer, httpReferrer);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::clearHTTPReferrer()
</span><span class="lines">@@ -314,12 +319,12 @@
</span><span class="cx">
</span><span class="cx"> String ResourceRequestBase::httpOrigin() const
</span><span class="cx"> {
</span><del>- return httpHeaderField("Origin");
</del><ins>+ return httpHeaderField(HTTPHeaderName::Origin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setHTTPOrigin(const String& httpOrigin)
</span><span class="cx"> {
</span><del>- setHTTPHeaderField("Origin", httpOrigin);
</del><ins>+ setHTTPHeaderField(HTTPHeaderName::Origin, httpOrigin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::clearHTTPOrigin()
</span><span class="lines">@@ -334,12 +339,12 @@
</span><span class="cx">
</span><span class="cx"> String ResourceRequestBase::httpUserAgent() const
</span><span class="cx"> {
</span><del>- return httpHeaderField("User-Agent");
</del><ins>+ return httpHeaderField(HTTPHeaderName::UserAgent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setHTTPUserAgent(const String& httpUserAgent)
</span><span class="cx"> {
</span><del>- setHTTPHeaderField("User-Agent", httpUserAgent);
</del><ins>+ setHTTPHeaderField(HTTPHeaderName::UserAgent, httpUserAgent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::clearHTTPUserAgent()
</span><span class="lines">@@ -354,12 +359,12 @@
</span><span class="cx">
</span><span class="cx"> String ResourceRequestBase::httpAccept() const
</span><span class="cx"> {
</span><del>- return httpHeaderField("Accept");
</del><ins>+ return httpHeaderField(HTTPHeaderName::Accept);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setHTTPAccept(const String& httpAccept)
</span><span class="cx"> {
</span><del>- setHTTPHeaderField("Accept", httpAccept);
</del><ins>+ setHTTPHeaderField(HTTPHeaderName::Accept, httpAccept);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::clearHTTPAccept()
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -81,12 +81,16 @@
</span><span class="cx">
</span><span class="cx"> const HTTPHeaderMap& httpHeaderFields() const;
</span><span class="cx"> String httpHeaderField(const AtomicString& name) const;
</span><del>- String httpHeaderField(const char* name) const;
</del><ins>+ String httpHeaderField(HTTPHeaderName) const;
</ins><span class="cx"> void setHTTPHeaderField(const AtomicString& name, const String& value);
</span><del>- void setHTTPHeaderField(const char* name, const String& value);
</del><ins>+ void setHTTPHeaderField(HTTPHeaderName, const String& value);
</ins><span class="cx"> void addHTTPHeaderField(const AtomicString& name, const String& value);
</span><span class="cx"> void addHTTPHeaderFields(const HTTPHeaderMap& headerFields);
</span><del>-
</del><ins>+
+ // Instead of passing a string literal to any of these functions, just use a HTTPHeaderName instead.
+ template<size_t length> String httpHeaderField(const char (&)[length]) const = delete;
+ template<size_t length> void setHTTPHeaderField(const char (&)[length], const String&) = delete;
+
</ins><span class="cx"> void clearHTTPAuthorization();
</span><span class="cx">
</span><span class="cx"> String httpContentType() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacResourceHandleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (169973 => 169974)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-06-14 17:43:32 UTC (rev 169973)
+++ trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm 2014-06-14 17:49:44 UTC (rev 169974)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #import "FormDataStreamMac.h"
</span><span class="cx"> #import "Frame.h"
</span><span class="cx"> #import "FrameLoader.h"
</span><ins>+#import "HTTPHeaderNames.h"
</ins><span class="cx"> #import "Logging.h"
</span><span class="cx"> #import "MIMETypeRegistry.h"
</span><span class="cx"> #import "NetworkingContext.h"
</span><span class="lines">@@ -455,7 +456,7 @@
</span><span class="cx">
</span><span class="cx"> String originalContentType = d->m_firstRequest.httpContentType();
</span><span class="cx"> if (!originalContentType.isEmpty())
</span><del>- request.setHTTPHeaderField("Content-Type", originalContentType);
</del><ins>+ request.setHTTPHeaderField(HTTPHeaderName::ContentType, originalContentType);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>