Title: [169974] trunk/Source/WebCore
Revision
169974
Author
[email protected]
Date
2014-06-14 10:49:44 -0700 (Sat, 14 Jun 2014)

Log Message

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):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (169973 => 169974)


--- 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)
@@ -1,3 +1,48 @@
+2014-06-13  Anders Carlsson  <[email protected]>
+
+        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):
+
 2014-06-14  Simon Fraser  <[email protected]>
 
         Masks disappear when layers become tiled

Modified: trunk/Source/WebCore/WebCore.exp.in (169973 => 169974)


--- 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)
@@ -818,7 +818,6 @@
 __ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
 __ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
 __ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
-__ZN7WebCore19ResourceRequestBase18setHTTPHeaderFieldEPKcRKN3WTF6StringE
 __ZN7WebCore19ResourceRequestBase19addHTTPHeaderFieldsERKNS_13HTTPHeaderMapE
 __ZN7WebCore19ResourceRequestBase22defaultTimeoutIntervalEv
 __ZN7WebCore19ResourceRequestBase24s_defaultTimeoutIntervalE
@@ -1785,7 +1784,6 @@
 __ZNK7WebCore19MediaSessionManager30applicationWillEnterBackgroundEv
 __ZNK7WebCore19MediaSessionManager30applicationWillEnterForegroundEv
 __ZNK7WebCore19ResourceRequestBase10httpMethodEv
-__ZNK7WebCore19ResourceRequestBase15httpHeaderFieldEPKc
 __ZNK7WebCore19ResourceRequestBase20firstPartyForCookiesEv
 __ZNK7WebCore19ResourceRequestBase3urlEv
 __ZNK7WebCore19ResourceRequestBase6isNullEv

Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (169973 => 169974)


--- 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)
@@ -35,6 +35,7 @@
 #include "Blob.h"
 #include "BlobURL.h"
 #include "FileReaderLoaderClient.h"
+#include "HTTPHeaderNames.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
 #include "ScriptExecutionContext.h"
@@ -88,7 +89,7 @@
     ResourceRequest request(m_urlForReading);
     request.setHTTPMethod("GET");
     if (m_hasRange)
-        request.setHTTPHeaderField("Range", String::format("bytes=%d-%d", m_rangeStart, m_rangeEnd));
+        request.setHTTPHeaderField(HTTPHeaderName::Range, String::format("bytes=%d-%d", m_rangeStart, m_rangeEnd));
 
     ThreadableLoaderOptions options;
     options.sendLoadCallbacks = SendCallbacks;

Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (169973 => 169974)


--- 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)
@@ -43,6 +43,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "HTTPHeaderMap.h"
+#include "HTTPHeaderNames.h"
 #include "IconController.h"
 #include "InspectorClient.h"
 #include "InspectorPageAgent.h"
@@ -311,9 +312,9 @@
     request.setReportRawHeaders(true);
 
     if (m_cacheDisabled) {
-        request.setHTTPHeaderField("Pragma", "no-cache");
+        request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
         request.setCachePolicy(ReloadIgnoringCacheData);
-        request.setHTTPHeaderField("Cache-Control", "no-cache");
+        request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
     }
 
     Inspector::TypeBuilder::Page::ResourceType::Enum resourceType = InspectorPageAgent::resourceTypeJson(type);

Modified: trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp (169973 => 169974)


--- 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)
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "CrossOriginAccessControl.h"
 
+#include "HTTPHeaderNames.h"
 #include "HTTPParsers.h"
 #include "ResourceRequest.h"
 #include "ResourceResponse.h"
@@ -107,7 +108,7 @@
     ResourceRequest preflightRequest(request.url());
     updateRequestForAccessControl(preflightRequest, securityOrigin, DoNotAllowStoredCredentials);
     preflightRequest.setHTTPMethod("OPTIONS");
-    preflightRequest.setHTTPHeaderField("Access-Control-Request-Method", request.httpMethod());
+    preflightRequest.setHTTPHeaderField(HTTPHeaderName::AccessControlRequestMethod, request.httpMethod());
     preflightRequest.setPriority(request.priority());
 
     const HTTPHeaderMap& requestHeaderFields = request.httpHeaderFields();
@@ -125,7 +126,7 @@
             headerBuffer.append(headerField.key);
         }
 
-        preflightRequest.setHTTPHeaderField("Access-Control-Request-Headers", headerBuffer.toString().lower());
+        preflightRequest.setHTTPHeaderField(HTTPHeaderName::AccessControlRequestHeaders, headerBuffer.toString().lower());
     }
 
     return preflightRequest;

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (169973 => 169974)


--- 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)
@@ -70,6 +70,7 @@
 #include "HTMLNames.h"
 #include "HTMLObjectElement.h"
 #include "HTMLParserIdioms.h"
+#include "HTTPHeaderNames.h"
 #include "HTTPParsers.h"
 #include "HistoryController.h"
 #include "HistoryItem.h"
@@ -2564,10 +2565,10 @@
 
     if (request.cachePolicy() == ReloadIgnoringCacheData) {
         if (loadType == FrameLoadTypeReload)
-            request.setHTTPHeaderField("Cache-Control", "max-age=0");
+            request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
         else if (loadType == FrameLoadTypeReloadFromOrigin) {
-            request.setHTTPHeaderField("Cache-Control", "no-cache");
-            request.setHTTPHeaderField("Pragma", "no-cache");
+            request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
+            request.setHTTPHeaderField(HTTPHeaderName::Pragma, "no-cache");
         }
     }
     

Modified: trunk/Source/WebCore/loader/PingLoader.cpp (169973 => 169974)


--- 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)
@@ -37,6 +37,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "HTTPHeaderNames.h"
 #include "InspectorInstrumentation.h"
 #include "Page.h"
 #include "ProgressTracker.h"
@@ -57,7 +58,7 @@
     }
 
     ResourceRequest request(url);
-    request.setHTTPHeaderField("Cache-Control", "max-age=0");
+    request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
     String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), request.url(), frame.loader().outgoingReferrer());
     if (!referrer.isEmpty())
         request.setHTTPReferrer(referrer);
@@ -73,15 +74,15 @@
     request.setHTTPMethod("POST");
     request.setHTTPContentType("text/ping");
     request.setHTTPBody(FormData::create("PING"));
-    request.setHTTPHeaderField("Cache-Control", "max-age=0");
+    request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
     frame.loader().addExtraFieldsToSubresourceRequest(request);
 
     SecurityOrigin* sourceOrigin = frame.document()->securityOrigin();
     RefPtr<SecurityOrigin> pingOrigin = SecurityOrigin::create(pingURL);
     FrameLoader::addHTTPOriginIfNeeded(request, sourceOrigin->toString());
-    request.setHTTPHeaderField("Ping-To", destinationURL);
+    request.setHTTPHeaderField(HTTPHeaderName::PingTo, destinationURL);
     if (!SecurityPolicy::shouldHideReferrer(pingURL, frame.loader().outgoingReferrer())) {
-        request.setHTTPHeaderField("Ping-From", frame.document()->url());
+        request.setHTTPHeaderField(HTTPHeaderName::PingFrom, frame.document()->url());
         if (!sourceOrigin->isSameSchemeHostPort(pingOrigin.get())) {
             String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), pingURL, frame.loader().outgoingReferrer());
             if (!referrer.isEmpty())

Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (169973 => 169974)


--- 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)
@@ -37,6 +37,7 @@
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "HTTPHeaderNames.h"
 #include "InspectorInstrumentation.h"
 #include "ManifestParser.h"
 #include "Page.h"
@@ -480,16 +481,16 @@
 {
     ResourceRequest request(url);
     m_frame->loader().applyUserAgent(request);
-    request.setHTTPHeaderField("Cache-Control", "max-age=0");
+    request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
 
     if (newestCachedResource) {
         const String& lastModified = newestCachedResource->response().httpHeaderField("Last-Modified");
         const String& eTag = newestCachedResource->response().httpHeaderField("ETag");
         if (!lastModified.isEmpty() || !eTag.isEmpty()) {
             if (!lastModified.isEmpty())
-                request.setHTTPHeaderField("If-Modified-Since", lastModified);
+                request.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
             if (!eTag.isEmpty())
-                request.setHTTPHeaderField("If-None-Match", eTag);
+                request.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
         }
     }
 

Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (169973 => 169974)


--- 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)
@@ -33,6 +33,7 @@
 #include "DocumentLoader.h"
 #include "FrameLoader.h"
 #include "FrameLoaderClient.h"
+#include "HTTPHeaderNames.h"
 #include "InspectorInstrumentation.h"
 #include "URL.h"
 #include "LoaderStrategy.h"
@@ -287,17 +288,17 @@
         if (!lastModified.isEmpty() || !eTag.isEmpty()) {
             ASSERT(cachedResourceLoader->cachePolicy(type()) != CachePolicyReload);
             if (cachedResourceLoader->cachePolicy(type()) == CachePolicyRevalidate)
-                m_resourceRequest.setHTTPHeaderField("Cache-Control", "max-age=0");
+                m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::CacheControl, "max-age=0");
             if (!lastModified.isEmpty())
-                m_resourceRequest.setHTTPHeaderField("If-Modified-Since", lastModified);
+                m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::IfModifiedSince, lastModified);
             if (!eTag.isEmpty())
-                m_resourceRequest.setHTTPHeaderField("If-None-Match", eTag);
+                m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::IfNoneMatch, eTag);
         }
     }
 
 #if ENABLE(LINK_PREFETCH)
     if (type() == CachedResource::LinkPrefetch || type() == CachedResource::LinkSubresource)
-        m_resourceRequest.setHTTPHeaderField("Purpose", "prefetch");
+        m_resourceRequest.setHTTPHeaderField(HTTPHeaderName::Purpose, "prefetch");
 #endif
     m_resourceRequest.setPriority(loadPriority());
 

Modified: trunk/Source/WebCore/page/EventSource.cpp (169973 => 169974)


--- 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)
@@ -41,6 +41,7 @@
 #include "EventException.h"
 #include "ExceptionCode.h"
 #include "Frame.h"
+#include "HTTPHeaderNames.h"
 #include "MemoryCache.h"
 #include "MessageEvent.h"
 #include "ResourceError.h"
@@ -119,10 +120,10 @@
 
     ResourceRequest request(m_url);
     request.setHTTPMethod("GET");
-    request.setHTTPHeaderField("Accept", "text/event-stream");
-    request.setHTTPHeaderField("Cache-Control", "no-cache");
+    request.setHTTPHeaderField(HTTPHeaderName::Accept, "text/event-stream");
+    request.setHTTPHeaderField(HTTPHeaderName::CacheControl, "no-cache");
     if (!m_lastEventId.isEmpty())
-        request.setHTTPHeaderField("Last-Event-ID", m_lastEventId);
+        request.setHTTPHeaderField(HTTPHeaderName::LastEventID, m_lastEventId);
 
     SecurityOrigin* origin = scriptExecutionContext()->securityOrigin();
 

Modified: trunk/Source/WebCore/platform/network/BlobResourceHandle.cpp (169973 => 169974)


--- 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)
@@ -36,6 +36,7 @@
 #include "BlobData.h"
 #include "FileStream.h"
 #include "FileSystem.h"
+#include "HTTPHeaderNames.h"
 #include "HTTPParsers.h"
 #include "URL.h"
 #include "ResourceError.h"
@@ -236,7 +237,7 @@
     }
 
     // Parse the "Range" header we care about.
-    String range = firstRequest().httpHeaderField("Range");
+    String range = firstRequest().httpHeaderField(HTTPHeaderName::Range);
     if (!range.isEmpty() && !parseRange(range, m_rangeOffset, m_rangeEnd, m_rangeSuffixLength)) {
         m_errorCode = rangeError;
         notifyResponse();

Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169973 => 169974)


--- 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)
@@ -24,21 +24,33 @@
 //
 
 Accept
+Access-Control-Request-Headers
+Access-Control-Request-Method
 Authorization
+Cache-Control
 Connection
 Content-Length
 Content-Type
+Host
 If-Match
 If-Modified-Since
 If-None-Match
 If-Range
 If-Unmodified-Since
+Last-Event-ID
 Location
 Origin
+Ping-From
+Ping-To
+Purpose
+Pragma
+Range
 Referer
 Sec-WebSocket-Accept
+Sec-WebSocket-Extensions
 Sec-WebSocket-Key
 Sec-WebSocket-Protocol
+Sec-WebSocket-Version
 Set-Cookie
 Set-Cookie2
 Upgrade

Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (169973 => 169974)


--- 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)
@@ -239,7 +239,7 @@
     return m_httpHeaderFields.get(name);
 }
 
-String ResourceRequestBase::httpHeaderField(const char* name) const
+String ResourceRequestBase::httpHeaderField(HTTPHeaderName name) const
 {
     updateResourceRequest(); 
     
@@ -248,17 +248,22 @@
 
 void ResourceRequestBase::setHTTPHeaderField(const AtomicString& name, const String& value)
 {
-    updateResourceRequest(); 
+    updateResourceRequest();
+
+    m_httpHeaderFields.set(name, value);
     
-    m_httpHeaderFields.set(name, value); 
-    
     if (url().protocolIsInHTTPFamily())
         m_platformRequestUpdated = false;
 }
 
-void ResourceRequestBase::setHTTPHeaderField(const char* name, const String& value)
+void ResourceRequestBase::setHTTPHeaderField(HTTPHeaderName name, const String& value)
 {
-    setHTTPHeaderField(AtomicString(name), value);
+    updateResourceRequest();
+
+    m_httpHeaderFields.set(name, value);
+
+    if (url().protocolIsInHTTPFamily())
+        m_platformRequestUpdated = false;
 }
 
 void ResourceRequestBase::clearHTTPAuthorization()
@@ -274,12 +279,12 @@
 
 String ResourceRequestBase::httpContentType() const
 {
-    return httpHeaderField("Content-Type");
+    return httpHeaderField(HTTPHeaderName::ContentType);
 }
 
 void ResourceRequestBase::setHTTPContentType(const String& httpContentType)
 {
-    setHTTPHeaderField("Content-Type", httpContentType);
+    setHTTPHeaderField(HTTPHeaderName::ContentType, httpContentType);
 }
 
 void ResourceRequestBase::clearHTTPContentType()
@@ -294,12 +299,12 @@
 
 String ResourceRequestBase::httpReferrer() const
 {
-    return httpHeaderField("Referer");
+    return httpHeaderField(HTTPHeaderName::Referer);
 }
 
 void ResourceRequestBase::setHTTPReferrer(const String& httpReferrer)
 {
-    setHTTPHeaderField("Referer", httpReferrer);
+    setHTTPHeaderField(HTTPHeaderName::Referer, httpReferrer);
 }
 
 void ResourceRequestBase::clearHTTPReferrer()
@@ -314,12 +319,12 @@
 
 String ResourceRequestBase::httpOrigin() const
 {
-    return httpHeaderField("Origin");
+    return httpHeaderField(HTTPHeaderName::Origin);
 }
 
 void ResourceRequestBase::setHTTPOrigin(const String& httpOrigin)
 {
-    setHTTPHeaderField("Origin", httpOrigin);
+    setHTTPHeaderField(HTTPHeaderName::Origin, httpOrigin);
 }
 
 void ResourceRequestBase::clearHTTPOrigin()
@@ -334,12 +339,12 @@
 
 String ResourceRequestBase::httpUserAgent() const
 {
-    return httpHeaderField("User-Agent");
+    return httpHeaderField(HTTPHeaderName::UserAgent);
 }
 
 void ResourceRequestBase::setHTTPUserAgent(const String& httpUserAgent)
 {
-    setHTTPHeaderField("User-Agent", httpUserAgent);
+    setHTTPHeaderField(HTTPHeaderName::UserAgent, httpUserAgent);
 }
 
 void ResourceRequestBase::clearHTTPUserAgent()
@@ -354,12 +359,12 @@
 
 String ResourceRequestBase::httpAccept() const
 {
-    return httpHeaderField("Accept");
+    return httpHeaderField(HTTPHeaderName::Accept);
 }
 
 void ResourceRequestBase::setHTTPAccept(const String& httpAccept)
 {
-    setHTTPHeaderField("Accept", httpAccept);
+    setHTTPHeaderField(HTTPHeaderName::Accept, httpAccept);
 }
 
 void ResourceRequestBase::clearHTTPAccept()

Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (169973 => 169974)


--- 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)
@@ -81,12 +81,16 @@
         
         const HTTPHeaderMap& httpHeaderFields() const;
         String httpHeaderField(const AtomicString& name) const;
-        String httpHeaderField(const char* name) const;
+        String httpHeaderField(HTTPHeaderName) const;
         void setHTTPHeaderField(const AtomicString& name, const String& value);
-        void setHTTPHeaderField(const char* name, const String& value);
+        void setHTTPHeaderField(HTTPHeaderName, const String& value);
         void addHTTPHeaderField(const AtomicString& name, const String& value);
         void addHTTPHeaderFields(const HTTPHeaderMap& headerFields);
-        
+
+        // 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;
+
         void clearHTTPAuthorization();
 
         String httpContentType() const;

Modified: trunk/Source/WebCore/platform/network/mac/ResourceHandleMac.mm (169973 => 169974)


--- 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)
@@ -35,6 +35,7 @@
 #import "FormDataStreamMac.h"
 #import "Frame.h"
 #import "FrameLoader.h"
+#import "HTTPHeaderNames.h"
 #import "Logging.h"
 #import "MIMETypeRegistry.h"
 #import "NetworkingContext.h"
@@ -455,7 +456,7 @@
 
             String originalContentType = d->m_firstRequest.httpContentType();
             if (!originalContentType.isEmpty())
-                request.setHTTPHeaderField("Content-Type", originalContentType);
+                request.setHTTPHeaderField(HTTPHeaderName::ContentType, originalContentType);
         }
     }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to