<!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>[169989] 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/169989">169989</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-15 09:33:58 -0700 (Sun, 15 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adopt HTTPHeaderName in ResourceResponseBase
https://bugs.webkit.org/show_bug.cgi?id=133919
Reviewed by Sam Weinig.
* platform/network/HTTPHeaderNames.in:
* platform/network/ResourceResponseBase.cpp:
(WebCore::ResourceResponseBase::updateHeaderParsedState):
(WebCore::ResourceResponseBase::setHTTPHeaderField):
(WebCore::ResourceResponseBase::addHTTPHeaderField):
(WebCore::ResourceResponseBase::parseCacheControlDirectives):
(WebCore::ResourceResponseBase::hasCacheValidatorFields):
(WebCore::parseDateValueInHeader):
(WebCore::ResourceResponseBase::date):
(WebCore::ResourceResponseBase::age):
(WebCore::ResourceResponseBase::expires):
(WebCore::ResourceResponseBase::lastModified):
(WebCore::ResourceResponseBase::isAttachment):
* platform/network/ResourceResponseBase.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin">trunk/Source/WebCore/platform/network/HTTPHeaderNames.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBasecpp">trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceResponseBaseh">trunk/Source/WebCore/platform/network/ResourceResponseBase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169988 => 169989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-15 11:04:19 UTC (rev 169988)
+++ trunk/Source/WebCore/ChangeLog 2014-06-15 16:33:58 UTC (rev 169989)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-06-14 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Adopt HTTPHeaderName in ResourceResponseBase
+ https://bugs.webkit.org/show_bug.cgi?id=133919
+
+ Reviewed by Sam Weinig.
+
+ * platform/network/HTTPHeaderNames.in:
+ * platform/network/ResourceResponseBase.cpp:
+ (WebCore::ResourceResponseBase::updateHeaderParsedState):
+ (WebCore::ResourceResponseBase::setHTTPHeaderField):
+ (WebCore::ResourceResponseBase::addHTTPHeaderField):
+ (WebCore::ResourceResponseBase::parseCacheControlDirectives):
+ (WebCore::ResourceResponseBase::hasCacheValidatorFields):
+ (WebCore::parseDateValueInHeader):
+ (WebCore::ResourceResponseBase::date):
+ (WebCore::ResourceResponseBase::age):
+ (WebCore::ResourceResponseBase::expires):
+ (WebCore::ResourceResponseBase::lastModified):
+ (WebCore::ResourceResponseBase::isAttachment):
+ * platform/network/ResourceResponseBase.h:
+
+2014-06-14 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Simplify ResourceRequest constructors
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=133911
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderNamesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderNames.in (169988 => 169989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-15 11:04:19 UTC (rev 169988)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderNames.in 2014-06-15 16:33:58 UTC (rev 169989)
</span><span class="lines">@@ -26,16 +26,21 @@
</span><span class="cx"> Accept
</span><span class="cx"> Access-Control-Request-Headers
</span><span class="cx"> Access-Control-Request-Method
</span><ins>+Age
</ins><span class="cx"> Authorization
</span><span class="cx"> Cache-Control
</span><span class="cx"> Connection
</span><ins>+Content-Disposition
</ins><span class="cx"> Content-Language
</span><span class="cx"> Content-Length
</span><span class="cx"> Content-Security-Policy
</span><span class="cx"> Content-Security-Policy-Report-Only
</span><span class="cx"> Content-Type
</span><span class="cx"> Cookie
</span><ins>+Date
</ins><span class="cx"> Default-Style
</span><ins>+ETag
+Expires
</ins><span class="cx"> Host
</span><span class="cx"> If-Match
</span><span class="cx"> If-Modified-Since
</span><span class="lines">@@ -43,6 +48,7 @@
</span><span class="cx"> If-Range
</span><span class="cx"> If-Unmodified-Since
</span><span class="cx"> Last-Event-ID
</span><ins>+Last-Modified
</ins><span class="cx"> Location
</span><span class="cx"> Origin
</span><span class="cx"> Ping-From
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp (169988 => 169989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-06-15 11:04:19 UTC (rev 169988)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.cpp 2014-06-15 16:33:58 UTC (rev 169989)
</span><span class="lines">@@ -27,11 +27,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceResponseBase.h"
</span><span class="cx">
</span><ins>+#include "HTTPHeaderNames.h"
</ins><span class="cx"> #include "HTTPParsers.h"
</span><span class="cx"> #include "ResourceResponse.h"
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><ins>+#include <wtf/text/StringView.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="lines">@@ -285,32 +287,42 @@
</span><span class="cx"> return m_httpHeaderFields.get(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ResourceResponseBase::updateHeaderParsedState(const AtomicString& name)
</del><ins>+void ResourceResponseBase::updateHeaderParsedState(HTTPHeaderName name)
</ins><span class="cx"> {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, ageHeader, ("age", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, cacheControlHeader, ("cache-control", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, dateHeader, ("date", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, expiresHeader, ("expires", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma", AtomicString::ConstructFromLiteral));
</del><ins>+ switch (name) {
+ case HTTPHeaderName::Age:
+ m_haveParsedAgeHeader = false;
+ break;
</ins><span class="cx">
</span><del>- if (equalIgnoringCase(name, ageHeader))
- m_haveParsedAgeHeader = false;
- else if (equalIgnoringCase(name, cacheControlHeader) || equalIgnoringCase(name, pragmaHeader))
</del><ins>+ case HTTPHeaderName::CacheControl:
+ case HTTPHeaderName::Pragma:
</ins><span class="cx"> m_haveParsedCacheControlHeader = false;
</span><del>- else if (equalIgnoringCase(name, dateHeader))
</del><ins>+ break;
+
+ case HTTPHeaderName::Date:
</ins><span class="cx"> m_haveParsedDateHeader = false;
</span><del>- else if (equalIgnoringCase(name, expiresHeader))
</del><ins>+ break;
+
+ case HTTPHeaderName::Expires:
</ins><span class="cx"> m_haveParsedExpiresHeader = false;
</span><del>- else if (equalIgnoringCase(name, lastModifiedHeader))
</del><ins>+ break;
+
+ case HTTPHeaderName::LastModified:
</ins><span class="cx"> m_haveParsedLastModifiedHeader = false;
</span><ins>+ break;
+
+ default:
+ break;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceResponseBase::setHTTPHeaderField(const AtomicString& name, const String& value)
</span><span class="cx"> {
</span><span class="cx"> lazyInit(CommonAndUncommonFields);
</span><span class="cx">
</span><del>- updateHeaderParsedState(name);
</del><ins>+ HTTPHeaderName headerName;
+ if (findHTTPHeaderName(name.string(), headerName))
+ updateHeaderParsedState(headerName);
</ins><span class="cx">
</span><span class="cx"> m_httpHeaderFields.set(name, value);
</span><span class="cx">
</span><span class="lines">@@ -321,7 +333,9 @@
</span><span class="cx"> {
</span><span class="cx"> lazyInit(CommonAndUncommonFields);
</span><span class="cx">
</span><del>- updateHeaderParsedState(name);
</del><ins>+ HTTPHeaderName headerName;
+ if (findHTTPHeaderName(name.string(), headerName))
+ updateHeaderParsedState(headerName);
</ins><span class="cx">
</span><span class="cx"> m_httpHeaderFields.add(name, value);
</span><span class="cx"> }
</span><span class="lines">@@ -345,13 +359,7 @@
</span><span class="cx"> m_cacheControlContainsNoCache = false;
</span><span class="cx"> m_cacheControlMaxAge = std::numeric_limits<double>::quiet_NaN();
</span><span class="cx">
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, cacheControlString, ("cache-control", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, noCacheDirective, ("no-cache", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, noStoreDirective, ("no-store", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, mustRevalidateDirective, ("must-revalidate", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, maxAgeDirective, ("max-age", AtomicString::ConstructFromLiteral));
-
- String cacheControlValue = m_httpHeaderFields.get(cacheControlString);
</del><ins>+ String cacheControlValue = m_httpHeaderFields.get(HTTPHeaderName::CacheControl);
</ins><span class="cx"> if (!cacheControlValue.isEmpty()) {
</span><span class="cx"> Vector<std::pair<String, String>> directives;
</span><span class="cx"> parseCacheHeader(cacheControlValue, directives);
</span><span class="lines">@@ -360,13 +368,13 @@
</span><span class="cx"> for (size_t i = 0; i < directivesSize; ++i) {
</span><span class="cx"> // RFC2616 14.9.1: A no-cache directive with a value is only meaningful for proxy caches.
</span><span class="cx"> // It should be ignored by a browser level cache.
</span><del>- if (equalIgnoringCase(directives[i].first, noCacheDirective) && directives[i].second.isEmpty())
</del><ins>+ if (equalIgnoringCase(directives[i].first, "no-cache") && directives[i].second.isEmpty())
</ins><span class="cx"> m_cacheControlContainsNoCache = true;
</span><del>- else if (equalIgnoringCase(directives[i].first, noStoreDirective))
</del><ins>+ else if (equalIgnoringCase(directives[i].first, "no-store"))
</ins><span class="cx"> m_cacheControlContainsNoStore = true;
</span><del>- else if (equalIgnoringCase(directives[i].first, mustRevalidateDirective))
</del><ins>+ else if (equalIgnoringCase(directives[i].first, "must-revalidate"))
</ins><span class="cx"> m_cacheControlContainsMustRevalidate = true;
</span><del>- else if (equalIgnoringCase(directives[i].first, maxAgeDirective)) {
</del><ins>+ else if (equalIgnoringCase(directives[i].first, "max-age")) {
</ins><span class="cx"> if (!std::isnan(m_cacheControlMaxAge)) {
</span><span class="cx"> // First max-age directive wins if there are multiple ones.
</span><span class="cx"> continue;
</span><span class="lines">@@ -383,10 +391,9 @@
</span><span class="cx"> // Handle Pragma: no-cache
</span><span class="cx"> // This is deprecated and equivalent to Cache-control: no-cache
</span><span class="cx"> // Don't bother tokenizing the value, it is not important
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma", AtomicString::ConstructFromLiteral));
- String pragmaValue = m_httpHeaderFields.get(pragmaHeader);
</del><ins>+ String pragmaValue = m_httpHeaderFields.get(HTTPHeaderName::Pragma);
</ins><span class="cx">
</span><del>- m_cacheControlContainsNoCache = pragmaValue.lower().contains(noCacheDirective);
</del><ins>+ m_cacheControlContainsNoCache = pragmaValue.contains("no-cache", false);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -415,9 +422,7 @@
</span><span class="cx"> {
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified", AtomicString::ConstructFromLiteral));
- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, eTagHeader, ("etag", AtomicString::ConstructFromLiteral));
- return !m_httpHeaderFields.get(lastModifiedHeader).isEmpty() || !m_httpHeaderFields.get(eTagHeader).isEmpty();
</del><ins>+ return !m_httpHeaderFields.get(HTTPHeaderName::LastModified).isEmpty() || !m_httpHeaderFields.get(HTTPHeaderName::ETag).isEmpty();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double ResourceResponseBase::cacheControlMaxAge() const
</span><span class="lines">@@ -427,7 +432,7 @@
</span><span class="cx"> return m_cacheControlMaxAge;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static double parseDateValueInHeader(const HTTPHeaderMap& headers, const AtomicString& headerName)
</del><ins>+static double parseDateValueInHeader(const HTTPHeaderMap& headers, HTTPHeaderName headerName)
</ins><span class="cx"> {
</span><span class="cx"> String headerValue = headers.get(headerName);
</span><span class="cx"> if (headerValue.isEmpty())
</span><span class="lines">@@ -447,8 +452,7 @@
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="cx"> if (!m_haveParsedDateHeader) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("date", AtomicString::ConstructFromLiteral));
- m_date = parseDateValueInHeader(m_httpHeaderFields, headerName);
</del><ins>+ m_date = parseDateValueInHeader(m_httpHeaderFields, HTTPHeaderName::Date);
</ins><span class="cx"> m_haveParsedDateHeader = true;
</span><span class="cx"> }
</span><span class="cx"> return m_date;
</span><span class="lines">@@ -459,8 +463,7 @@
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="cx"> if (!m_haveParsedAgeHeader) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("age", AtomicString::ConstructFromLiteral));
- String headerValue = m_httpHeaderFields.get(headerName);
</del><ins>+ String headerValue = m_httpHeaderFields.get(HTTPHeaderName::Age);
</ins><span class="cx"> bool ok;
</span><span class="cx"> m_age = headerValue.toDouble(&ok);
</span><span class="cx"> if (!ok)
</span><span class="lines">@@ -475,8 +478,7 @@
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="cx"> if (!m_haveParsedExpiresHeader) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("expires", AtomicString::ConstructFromLiteral));
- m_expires = parseDateValueInHeader(m_httpHeaderFields, headerName);
</del><ins>+ m_expires = parseDateValueInHeader(m_httpHeaderFields, HTTPHeaderName::Expires);
</ins><span class="cx"> m_haveParsedExpiresHeader = true;
</span><span class="cx"> }
</span><span class="cx"> return m_expires;
</span><span class="lines">@@ -487,8 +489,7 @@
</span><span class="cx"> lazyInit(CommonFieldsOnly);
</span><span class="cx">
</span><span class="cx"> if (!m_haveParsedLastModifiedHeader) {
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("last-modified", AtomicString::ConstructFromLiteral));
- m_lastModified = parseDateValueInHeader(m_httpHeaderFields, headerName);
</del><ins>+ m_lastModified = parseDateValueInHeader(m_httpHeaderFields, HTTPHeaderName::LastModified);
</ins><span class="cx"> m_haveParsedLastModifiedHeader = true;
</span><span class="cx"> }
</span><span class="cx"> return m_lastModified;
</span><span class="lines">@@ -498,14 +499,13 @@
</span><span class="cx"> {
</span><span class="cx"> lazyInit(CommonAndUncommonFields);
</span><span class="cx">
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("content-disposition", AtomicString::ConstructFromLiteral));
- String value = m_httpHeaderFields.get(headerName);
</del><ins>+ String value = m_httpHeaderFields.get(HTTPHeaderName::ContentDisposition);
</ins><span class="cx"> size_t loc = value.find(';');
</span><span class="cx"> if (loc != notFound)
</span><span class="cx"> value = value.left(loc);
</span><span class="cx"> value = value.stripWhiteSpace();
</span><del>- DEPRECATED_DEFINE_STATIC_LOCAL(const AtomicString, attachmentString, ("attachment", AtomicString::ConstructFromLiteral));
- return equalIgnoringCase(value, attachmentString);
</del><ins>+
+ return equalIgnoringCase(value, "attachment");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool ResourceResponseBase::wasCached() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceResponseBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceResponseBase.h (169988 => 169989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-06-15 11:04:19 UTC (rev 169988)
+++ trunk/Source/WebCore/platform/network/ResourceResponseBase.h 2014-06-15 16:33:58 UTC (rev 169989)
</span><span class="lines">@@ -168,7 +168,7 @@
</span><span class="cx"> private:
</span><span class="cx"> const ResourceResponse& asResourceResponse() const;
</span><span class="cx"> void parseCacheControlDirectives() const;
</span><del>- void updateHeaderParsedState(const AtomicString& name);
</del><ins>+ void updateHeaderParsedState(HTTPHeaderName);
</ins><span class="cx">
</span><span class="cx"> mutable bool m_haveParsedCacheControlHeader : 1;
</span><span class="cx"> mutable bool m_haveParsedAgeHeader : 1;
</span></span></pre>
</div>
</div>
</body>
</html>