Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
| 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
| 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
| 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. | 5 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. |
| 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ | 6 Copyright (C) 2009 Torch Mobile Inc. http://www.torchmobile.com/ |
| 7 | 7 |
| 8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
| 9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
| 10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 187 return WebURLRequest::RequestContextImage; | 187 return WebURLRequest::RequestContextImage; |
| 188 case Resource::Media: // TODO: Split this. | 188 case Resource::Media: // TODO: Split this. |
| 189 return WebURLRequest::RequestContextVideo; | 189 return WebURLRequest::RequestContextVideo; |
| 190 case Resource::Manifest: | 190 case Resource::Manifest: |
| 191 return WebURLRequest::RequestContextManifest; | 191 return WebURLRequest::RequestContextManifest; |
| 192 } | 192 } |
| 193 ASSERT_NOT_REACHED(); | 193 ASSERT_NOT_REACHED(); |
| 194 return WebURLRequest::RequestContextSubresource; | 194 return WebURLRequest::RequestContextSubresource; |
| 195 } | 195 } |
| 196 | 196 |
| 197 static void addAcceptHeader(ResourceRequest& request, Resource::Type type) | |
| 198 { | |
| 199 if (type == Resource::CSSStyleSheet) { | |
| 200 DEFINE_STATIC_LOCAL(const AtomicString, acceptCSS, ("text/css,*/*;q=0.1" , AtomicString::ConstructFromLiteral)); | |
| 201 request.setHTTPAccept(acceptCSS); | |
| 202 } else if (type == Resource::Script) { | |
| 203 DEFINE_STATIC_LOCAL(const AtomicString, acceptScripts, ("*/*", AtomicStr ing::ConstructFromLiteral)); | |
| 204 request.setHTTPAccept(acceptScripts); | |
| 205 } else if (type == Resource::Image) { | |
| 206 DEFINE_STATIC_LOCAL(const AtomicString, acceptImages, ("image/webp,image /*,*/*;q=0.8", AtomicString::ConstructFromLiteral)); | |
| 207 request.setHTTPAccept(acceptImages); | |
| 208 } else if (type == Resource::XSLStyleSheet) { | |
| 209 DEFINE_STATIC_LOCAL(const AtomicString, acceptXSLT, ("text/xml, applicat ion/xml, application/xhtml+xml, text/xsl, application/rss+xml, application/atom+ xml", AtomicString::ConstructFromLiteral)); | |
| 210 request.setHTTPAccept(acceptXSLT); | |
| 211 } | |
|
Yoav Weiss
2016/03/30 06:18:58
What about other Resource::Types? Where are they s
| |
| 212 } | |
| 213 | |
| 197 ResourceFetcher::ResourceFetcher(FetchContext* newContext) | 214 ResourceFetcher::ResourceFetcher(FetchContext* newContext) |
| 198 : m_context(newContext) | 215 : m_context(newContext) |
| 199 , m_archive(context().isMainFrame() ? nullptr : context().archive()) | 216 , m_archive(context().isMainFrame() ? nullptr : context().archive()) |
| 200 , m_resourceTimingReportTimer(this, &ResourceFetcher::resourceTimingReportTi merFired) | 217 , m_resourceTimingReportTimer(this, &ResourceFetcher::resourceTimingReportTi merFired) |
| 201 , m_autoLoadImages(true) | 218 , m_autoLoadImages(true) |
| 202 , m_imagesEnabled(true) | 219 , m_imagesEnabled(true) |
| 203 , m_allowStaleResources(false) | 220 , m_allowStaleResources(false) |
| 204 { | 221 { |
| 205 #if ENABLE(OILPAN) | 222 #if ENABLE(OILPAN) |
| 206 ThreadState::current()->registerPreFinalizer(this); | 223 ThreadState::current()->registerPreFinalizer(this); |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 526 } | 543 } |
| 527 | 544 |
| 528 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour ce::Type type) | 545 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour ce::Type type) |
| 529 { | 546 { |
| 530 if (request.getCachePolicy() == UseProtocolCachePolicy) | 547 if (request.getCachePolicy() == UseProtocolCachePolicy) |
| 531 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ e)); | 548 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ e)); |
| 532 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) | 549 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) |
| 533 determineRequestContext(request, type); | 550 determineRequestContext(request, type); |
| 534 if (type == Resource::LinkPrefetch) | 551 if (type == Resource::LinkPrefetch) |
| 535 request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); | 552 request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); |
| 553 addAcceptHeader(request, type); | |
| 536 | 554 |
| 537 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour ce) ? FetchMainResource : FetchSubresource); | 555 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour ce) ? FetchMainResource : FetchSubresource); |
| 538 } | 556 } |
| 539 | 557 |
| 540 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour ce* resource) | 558 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour ce* resource) |
| 541 { | 559 { |
| 542 ASSERT(resource); | 560 ASSERT(resource); |
| 543 ASSERT(memoryCache()->contains(resource)); | 561 ASSERT(memoryCache()->contains(resource)); |
| 544 ASSERT(resource->isLoaded()); | 562 ASSERT(resource->isLoaded()); |
| 545 ASSERT(resource->canUseCacheValidator()); | 563 ASSERT(resource->canUseCacheValidator()); |
| (...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1194 visitor->trace(m_loaders); | 1212 visitor->trace(m_loaders); |
| 1195 visitor->trace(m_nonBlockingLoaders); | 1213 visitor->trace(m_nonBlockingLoaders); |
| 1196 #if ENABLE(OILPAN) | 1214 #if ENABLE(OILPAN) |
| 1197 visitor->trace(m_documentResources); | 1215 visitor->trace(m_documentResources); |
| 1198 visitor->trace(m_preloads); | 1216 visitor->trace(m_preloads); |
| 1199 visitor->trace(m_resourceTimingInfoMap); | 1217 visitor->trace(m_resourceTimingInfoMap); |
| 1200 #endif | 1218 #endif |
| 1201 } | 1219 } |
| 1202 | 1220 |
| 1203 } // namespace blink | 1221 } // namespace blink |
| OLD | NEW |