| Index: third_party/WebKit/Source/platform/network/ResourceResponse.cpp
|
| diff --git a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
|
| index de8054a76bad978caa3786cc63b0d4a03cc1378d..7a8acbfd086474348ba95ae9981686c0fd49e355 100644
|
| --- a/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
|
| +++ b/third_party/WebKit/Source/platform/network/ResourceResponse.cpp
|
| @@ -293,22 +293,22 @@ const AtomicString& ResourceResponse::httpHeaderField(const AtomicString& name)
|
|
|
| static const AtomicString& cacheControlHeaderString()
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, cacheControlHeader, ("cache-control", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, cacheControlHeader, ("cache-control"));
|
| return cacheControlHeader;
|
| }
|
|
|
| static const AtomicString& pragmaHeaderString()
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, pragmaHeader, ("pragma"));
|
| return pragmaHeader;
|
| }
|
|
|
| void ResourceResponse::updateHeaderParsedState(const AtomicString& name)
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, ageHeader, ("age", AtomicString::ConstructFromLiteral));
|
| - DEFINE_STATIC_LOCAL(const AtomicString, dateHeader, ("date", AtomicString::ConstructFromLiteral));
|
| - DEFINE_STATIC_LOCAL(const AtomicString, expiresHeader, ("expires", AtomicString::ConstructFromLiteral));
|
| - DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, ageHeader, ("age"));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, dateHeader, ("date"));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, expiresHeader, ("expires"));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified"));
|
|
|
| if (equalIgnoringCase(name, ageHeader))
|
| m_haveParsedAgeHeader = false;
|
| @@ -383,8 +383,8 @@ bool ResourceResponse::cacheControlContainsMustRevalidate()
|
|
|
| bool ResourceResponse::hasCacheValidatorFields() const
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified", AtomicString::ConstructFromLiteral));
|
| - DEFINE_STATIC_LOCAL(const AtomicString, eTagHeader, ("etag", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, lastModifiedHeader, ("last-modified"));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, eTagHeader, ("etag"));
|
| return !m_httpHeaderFields.get(lastModifiedHeader).isEmpty() || !m_httpHeaderFields.get(eTagHeader).isEmpty();
|
| }
|
|
|
| @@ -420,7 +420,7 @@ static double parseDateValueInHeader(const HTTPHeaderMap& headers, const AtomicS
|
| double ResourceResponse::date() const
|
| {
|
| if (!m_haveParsedDateHeader) {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("date", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("date"));
|
| m_date = parseDateValueInHeader(m_httpHeaderFields, headerName);
|
| m_haveParsedDateHeader = true;
|
| }
|
| @@ -430,7 +430,7 @@ double ResourceResponse::date() const
|
| double ResourceResponse::age() const
|
| {
|
| if (!m_haveParsedAgeHeader) {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("age", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("age"));
|
| const AtomicString& headerValue = m_httpHeaderFields.get(headerName);
|
| bool ok;
|
| m_age = headerValue.toDouble(&ok);
|
| @@ -444,7 +444,7 @@ double ResourceResponse::age() const
|
| double ResourceResponse::expires() const
|
| {
|
| if (!m_haveParsedExpiresHeader) {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("expires", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("expires"));
|
| m_expires = parseDateValueInHeader(m_httpHeaderFields, headerName);
|
| m_haveParsedExpiresHeader = true;
|
| }
|
| @@ -454,7 +454,7 @@ double ResourceResponse::expires() const
|
| double ResourceResponse::lastModified() const
|
| {
|
| if (!m_haveParsedLastModifiedHeader) {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("last-modified", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("last-modified"));
|
| m_lastModified = parseDateValueInHeader(m_httpHeaderFields, headerName);
|
| m_haveParsedLastModifiedHeader = true;
|
| }
|
| @@ -463,13 +463,13 @@ double ResourceResponse::lastModified() const
|
|
|
| bool ResourceResponse::isAttachment() const
|
| {
|
| - DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("content-disposition", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, headerName, ("content-disposition"));
|
| String value = m_httpHeaderFields.get(headerName);
|
| size_t loc = value.find(';');
|
| if (loc != kNotFound)
|
| value = value.left(loc);
|
| value = value.stripWhiteSpace();
|
| - DEFINE_STATIC_LOCAL(const AtomicString, attachmentString, ("attachment", AtomicString::ConstructFromLiteral));
|
| + DEFINE_STATIC_LOCAL(const AtomicString, attachmentString, ("attachment"));
|
| return equalIgnoringCase(value, attachmentString);
|
| }
|
|
|
|
|