<!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>[169847] 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/169847">169847</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 15:34:05 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169846 => 169847)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,5 +1,37 @@
</span><span class="cx"> 2014-06-11 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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 <andersca@apple.com>
+
</ins><span class="cx"> Remove some more unneeded member functions from HTTPHeaderMap
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133768
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (169846 => 169847)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -271,6 +271,16 @@
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String ResourceRequestBase::httpContentType() const
+{
+ return httpHeaderField("Content-Type");
+}
+
+void ResourceRequestBase::setHTTPContentType(const String& httpContentType)
+{
+ setHTTPHeaderField("Content-Type", httpContentType);
+}
+
</ins><span class="cx"> void ResourceRequestBase::clearHTTPContentType()
</span><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span><span class="lines">@@ -281,6 +291,16 @@
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String ResourceRequestBase::httpReferrer() const
+{
+ return httpHeaderField("Referer");
+}
+
+void ResourceRequestBase::setHTTPReferrer(const String& httpReferrer)
+{
+ setHTTPHeaderField("Referer", httpReferrer);
+}
+
</ins><span class="cx"> void ResourceRequestBase::clearHTTPReferrer()
</span><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span><span class="lines">@@ -291,6 +311,16 @@
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String ResourceRequestBase::httpOrigin() const
+{
+ return httpHeaderField("Origin");
+}
+
+void ResourceRequestBase::setHTTPOrigin(const String& httpOrigin)
+{
+ setHTTPHeaderField("Origin", httpOrigin);
+}
+
</ins><span class="cx"> void ResourceRequestBase::clearHTTPOrigin()
</span><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span><span class="lines">@@ -301,6 +331,16 @@
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String ResourceRequestBase::httpUserAgent() const
+{
+ return httpHeaderField("User-Agent");
+}
+
+void ResourceRequestBase::setHTTPUserAgent(const String& httpUserAgent)
+{
+ setHTTPHeaderField("User-Agent", httpUserAgent);
+}
+
</ins><span class="cx"> void ResourceRequestBase::clearHTTPUserAgent()
</span><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span><span class="lines">@@ -311,6 +351,16 @@
</span><span class="cx"> m_platformRequestUpdated = false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String ResourceRequestBase::httpAccept() const
+{
+ return httpHeaderField("Accept");
+}
+
+void ResourceRequestBase::setHTTPAccept(const String& httpAccept)
+{
+ setHTTPHeaderField("Accept", httpAccept);
+}
+
</ins><span class="cx"> void ResourceRequestBase::clearHTTPAccept()
</span><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (169846 => 169847)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -89,24 +89,24 @@
</span><span class="cx">
</span><span class="cx"> void clearHTTPAuthorization();
</span><span class="cx">
</span><del>- String httpContentType() const { return httpHeaderField("Content-Type"); }
- void setHTTPContentType(const String& httpContentType) { setHTTPHeaderField("Content-Type", httpContentType); }
</del><ins>+ String httpContentType() const;
+ void setHTTPContentType(const String&);
</ins><span class="cx"> void clearHTTPContentType();
</span><span class="cx">
</span><del>- String httpReferrer() const { return httpHeaderField("Referer"); }
- void setHTTPReferrer(const String& httpReferrer) { setHTTPHeaderField("Referer", httpReferrer); }
</del><ins>+ String httpReferrer() const;
+ void setHTTPReferrer(const String&);
</ins><span class="cx"> void clearHTTPReferrer();
</span><span class="cx">
</span><del>- String httpOrigin() const { return httpHeaderField("Origin"); }
- void setHTTPOrigin(const String& httpOrigin) { setHTTPHeaderField("Origin", httpOrigin); }
</del><ins>+ String httpOrigin() const;
+ void setHTTPOrigin(const String&);
</ins><span class="cx"> void clearHTTPOrigin();
</span><span class="cx">
</span><del>- String httpUserAgent() const { return httpHeaderField("User-Agent"); }
- void setHTTPUserAgent(const String& httpUserAgent) { setHTTPHeaderField("User-Agent", httpUserAgent); }
</del><ins>+ String httpUserAgent() const;
+ void setHTTPUserAgent(const String&);
</ins><span class="cx"> void clearHTTPUserAgent();
</span><span class="cx">
</span><del>- String httpAccept() const { return httpHeaderField("Accept"); }
- void setHTTPAccept(const String& httpAccept) { setHTTPHeaderField("Accept", httpAccept); }
</del><ins>+ String httpAccept() const;
+ void setHTTPAccept(const String&);
</ins><span class="cx"> void clearHTTPAccept();
</span><span class="cx">
</span><span class="cx"> const Vector<String>& responseContentDispositionEncodingFallbackArray() const { return m_responseContentDispositionEncodingFallbackArray; }
</span></span></pre>
</div>
</div>
</body>
</html>