Title: [169847] trunk/Source/WebCore
- Revision
- 169847
- Author
- [email protected]
- Date
- 2014-06-11 15:34:05 -0700 (Wed, 11 Jun 2014)
Log Message
Move some HTTP header field accessors to ResourceRequestBase.cpp
https://bugs.webkit.org/show_bug.cgi?id=133773
Reviewed by Andreas Kling.
This will avoid having to include HTTPHeaderNames.h from ResourceRequestBase.h.
* platform/network/ResourceRequestBase.cpp:
(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:
(WebCore::ResourceRequestBase::httpContentType): Deleted.
(WebCore::ResourceRequestBase::setHTTPContentType): Deleted.
(WebCore::ResourceRequestBase::httpReferrer): Deleted.
(WebCore::ResourceRequestBase::setHTTPReferrer): Deleted.
(WebCore::ResourceRequestBase::httpOrigin): Deleted.
(WebCore::ResourceRequestBase::setHTTPOrigin): Deleted.
(WebCore::ResourceRequestBase::httpUserAgent): Deleted.
(WebCore::ResourceRequestBase::setHTTPUserAgent): Deleted.
(WebCore::ResourceRequestBase::httpAccept): Deleted.
(WebCore::ResourceRequestBase::setHTTPAccept): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (169846 => 169847)
--- trunk/Source/WebCore/ChangeLog 2014-06-11 22:31:31 UTC (rev 169846)
+++ trunk/Source/WebCore/ChangeLog 2014-06-11 22:34:05 UTC (rev 169847)
@@ -1,5 +1,37 @@
2014-06-11 Anders Carlsson <[email protected]>
+ Move some HTTP header field accessors to ResourceRequestBase.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=133773
+
+ Reviewed by Andreas Kling.
+
+ This will avoid having to include HTTPHeaderNames.h from ResourceRequestBase.h.
+
+ * platform/network/ResourceRequestBase.cpp:
+ (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:
+ (WebCore::ResourceRequestBase::httpContentType): Deleted.
+ (WebCore::ResourceRequestBase::setHTTPContentType): Deleted.
+ (WebCore::ResourceRequestBase::httpReferrer): Deleted.
+ (WebCore::ResourceRequestBase::setHTTPReferrer): Deleted.
+ (WebCore::ResourceRequestBase::httpOrigin): Deleted.
+ (WebCore::ResourceRequestBase::setHTTPOrigin): Deleted.
+ (WebCore::ResourceRequestBase::httpUserAgent): Deleted.
+ (WebCore::ResourceRequestBase::setHTTPUserAgent): Deleted.
+ (WebCore::ResourceRequestBase::httpAccept): Deleted.
+ (WebCore::ResourceRequestBase::setHTTPAccept): Deleted.
+
+2014-06-11 Anders Carlsson <[email protected]>
+
Remove some more unneeded member functions from HTTPHeaderMap
https://bugs.webkit.org/show_bug.cgi?id=133768
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (169846 => 169847)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-11 22:31:31 UTC (rev 169846)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-11 22:34:05 UTC (rev 169847)
@@ -271,6 +271,16 @@
m_platformRequestUpdated = false;
}
+String ResourceRequestBase::httpContentType() const
+{
+ return httpHeaderField("Content-Type");
+}
+
+void ResourceRequestBase::setHTTPContentType(const String& httpContentType)
+{
+ setHTTPHeaderField("Content-Type", httpContentType);
+}
+
void ResourceRequestBase::clearHTTPContentType()
{
updateResourceRequest();
@@ -281,6 +291,16 @@
m_platformRequestUpdated = false;
}
+String ResourceRequestBase::httpReferrer() const
+{
+ return httpHeaderField("Referer");
+}
+
+void ResourceRequestBase::setHTTPReferrer(const String& httpReferrer)
+{
+ setHTTPHeaderField("Referer", httpReferrer);
+}
+
void ResourceRequestBase::clearHTTPReferrer()
{
updateResourceRequest();
@@ -291,6 +311,16 @@
m_platformRequestUpdated = false;
}
+String ResourceRequestBase::httpOrigin() const
+{
+ return httpHeaderField("Origin");
+}
+
+void ResourceRequestBase::setHTTPOrigin(const String& httpOrigin)
+{
+ setHTTPHeaderField("Origin", httpOrigin);
+}
+
void ResourceRequestBase::clearHTTPOrigin()
{
updateResourceRequest();
@@ -301,6 +331,16 @@
m_platformRequestUpdated = false;
}
+String ResourceRequestBase::httpUserAgent() const
+{
+ return httpHeaderField("User-Agent");
+}
+
+void ResourceRequestBase::setHTTPUserAgent(const String& httpUserAgent)
+{
+ setHTTPHeaderField("User-Agent", httpUserAgent);
+}
+
void ResourceRequestBase::clearHTTPUserAgent()
{
updateResourceRequest();
@@ -311,6 +351,16 @@
m_platformRequestUpdated = false;
}
+String ResourceRequestBase::httpAccept() const
+{
+ return httpHeaderField("Accept");
+}
+
+void ResourceRequestBase::setHTTPAccept(const String& httpAccept)
+{
+ setHTTPHeaderField("Accept", httpAccept);
+}
+
void ResourceRequestBase::clearHTTPAccept()
{
updateResourceRequest();
Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (169846 => 169847)
--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-11 22:31:31 UTC (rev 169846)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-11 22:34:05 UTC (rev 169847)
@@ -89,24 +89,24 @@
void clearHTTPAuthorization();
- String httpContentType() const { return httpHeaderField("Content-Type"); }
- void setHTTPContentType(const String& httpContentType) { setHTTPHeaderField("Content-Type", httpContentType); }
+ String httpContentType() const;
+ void setHTTPContentType(const String&);
void clearHTTPContentType();
- String httpReferrer() const { return httpHeaderField("Referer"); }
- void setHTTPReferrer(const String& httpReferrer) { setHTTPHeaderField("Referer", httpReferrer); }
+ String httpReferrer() const;
+ void setHTTPReferrer(const String&);
void clearHTTPReferrer();
- String httpOrigin() const { return httpHeaderField("Origin"); }
- void setHTTPOrigin(const String& httpOrigin) { setHTTPHeaderField("Origin", httpOrigin); }
+ String httpOrigin() const;
+ void setHTTPOrigin(const String&);
void clearHTTPOrigin();
- String httpUserAgent() const { return httpHeaderField("User-Agent"); }
- void setHTTPUserAgent(const String& httpUserAgent) { setHTTPHeaderField("User-Agent", httpUserAgent); }
+ String httpUserAgent() const;
+ void setHTTPUserAgent(const String&);
void clearHTTPUserAgent();
- String httpAccept() const { return httpHeaderField("Accept"); }
- void setHTTPAccept(const String& httpAccept) { setHTTPHeaderField("Accept", httpAccept); }
+ String httpAccept() const;
+ void setHTTPAccept(const String&);
void clearHTTPAccept();
const Vector<String>& responseContentDispositionEncodingFallbackArray() const { return m_responseContentDispositionEncodingFallbackArray; }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes