| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 case Resource::XSLStyleSheet: | 81 case Resource::XSLStyleSheet: |
| 82 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); | 82 ASSERT(RuntimeEnabledFeatures::xsltEnabled()); |
| 83 case Resource::CSSStyleSheet: | 83 case Resource::CSSStyleSheet: |
| 84 return ResourceLoadPriorityHigh; | 84 return ResourceLoadPriorityHigh; |
| 85 case Resource::Raw: | 85 case Resource::Raw: |
| 86 case Resource::Script: | 86 case Resource::Script: |
| 87 case Resource::Font: | 87 case Resource::Font: |
| 88 case Resource::ImportResource: | 88 case Resource::ImportResource: |
| 89 case Resource::Manifest: | 89 case Resource::Manifest: |
| 90 return ResourceLoadPriorityMedium; | 90 return ResourceLoadPriorityMedium; |
| 91 case Resource::LinkSubresource: | |
| 92 case Resource::LinkPreload: | 91 case Resource::LinkPreload: |
| 93 case Resource::TextTrack: | 92 case Resource::TextTrack: |
| 94 case Resource::Media: | 93 case Resource::Media: |
| 95 case Resource::SVGDocument: | 94 case Resource::SVGDocument: |
| 96 return ResourceLoadPriorityLow; | 95 return ResourceLoadPriorityLow; |
| 97 case Resource::Image: | 96 case Resource::Image: |
| 98 case Resource::LinkPrefetch: | 97 case Resource::LinkPrefetch: |
| 99 return ResourceLoadPriorityVeryLow; | 98 return ResourceLoadPriorityVeryLow; |
| 100 } | 99 } |
| 101 | 100 |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 case Resource::Image: | 146 case Resource::Image: |
| 148 return WebURLRequest::RequestContextImage; | 147 return WebURLRequest::RequestContextImage; |
| 149 case Resource::Raw: | 148 case Resource::Raw: |
| 150 return WebURLRequest::RequestContextSubresource; | 149 return WebURLRequest::RequestContextSubresource; |
| 151 case Resource::ImportResource: | 150 case Resource::ImportResource: |
| 152 return WebURLRequest::RequestContextImport; | 151 return WebURLRequest::RequestContextImport; |
| 153 case Resource::LinkPrefetch: | 152 case Resource::LinkPrefetch: |
| 154 return WebURLRequest::RequestContextPrefetch; | 153 return WebURLRequest::RequestContextPrefetch; |
| 155 case Resource::LinkPreload: | 154 case Resource::LinkPreload: |
| 156 return WebURLRequest::RequestContextSubresource; | 155 return WebURLRequest::RequestContextSubresource; |
| 157 case Resource::LinkSubresource: | |
| 158 return WebURLRequest::RequestContextSubresource; | |
| 159 case Resource::TextTrack: | 156 case Resource::TextTrack: |
| 160 return WebURLRequest::RequestContextTrack; | 157 return WebURLRequest::RequestContextTrack; |
| 161 case Resource::SVGDocument: | 158 case Resource::SVGDocument: |
| 162 return WebURLRequest::RequestContextImage; | 159 return WebURLRequest::RequestContextImage; |
| 163 case Resource::Media: // TODO: Split this. | 160 case Resource::Media: // TODO: Split this. |
| 164 return WebURLRequest::RequestContextVideo; | 161 return WebURLRequest::RequestContextVideo; |
| 165 case Resource::Manifest: | 162 case Resource::Manifest: |
| 166 return WebURLRequest::RequestContextManifest; | 163 return WebURLRequest::RequestContextManifest; |
| 167 } | 164 } |
| 168 ASSERT_NOT_REACHED(); | 165 ASSERT_NOT_REACHED(); |
| (...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 495 { | 492 { |
| 496 determineRequestContext(request, type, context().isMainFrame()); | 493 determineRequestContext(request, type, context().isMainFrame()); |
| 497 } | 494 } |
| 498 | 495 |
| 499 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour
ce::Type type) | 496 void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resour
ce::Type type) |
| 500 { | 497 { |
| 501 if (request.cachePolicy() == UseProtocolCachePolicy) | 498 if (request.cachePolicy() == UseProtocolCachePolicy) |
| 502 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ
e)); | 499 request.setCachePolicy(context().resourceRequestCachePolicy(request, typ
e)); |
| 503 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) | 500 if (request.requestContext() == WebURLRequest::RequestContextUnspecified) |
| 504 determineRequestContext(request, type); | 501 determineRequestContext(request, type); |
| 505 if (type == Resource::LinkPrefetch || type == Resource::LinkSubresource) | 502 if (type == Resource::LinkPrefetch) |
| 506 request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); | 503 request.setHTTPHeaderField(HTTPNames::Purpose, "prefetch"); |
| 507 | 504 |
| 508 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour
ce) ? FetchMainResource : FetchSubresource); | 505 context().addAdditionalRequestHeaders(request, (type == Resource::MainResour
ce) ? FetchMainResource : FetchSubresource); |
| 509 } | 506 } |
| 510 | 507 |
| 511 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour
ce* resource) | 508 void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour
ce* resource) |
| 512 { | 509 { |
| 513 ASSERT(resource); | 510 ASSERT(resource); |
| 514 ASSERT(memoryCache()->contains(resource)); | 511 ASSERT(memoryCache()->contains(resource)); |
| 515 ASSERT(resource->isLoaded()); | 512 ASSERT(resource->isLoaded()); |
| (...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 visitor->trace(m_loaders); | 1165 visitor->trace(m_loaders); |
| 1169 visitor->trace(m_nonBlockingLoaders); | 1166 visitor->trace(m_nonBlockingLoaders); |
| 1170 #if ENABLE(OILPAN) | 1167 #if ENABLE(OILPAN) |
| 1171 visitor->trace(m_documentResources); | 1168 visitor->trace(m_documentResources); |
| 1172 visitor->trace(m_preloads); | 1169 visitor->trace(m_preloads); |
| 1173 visitor->trace(m_resourceTimingInfoMap); | 1170 visitor->trace(m_resourceTimingInfoMap); |
| 1174 #endif | 1171 #endif |
| 1175 } | 1172 } |
| 1176 | 1173 |
| 1177 } // namespace blink | 1174 } // namespace blink |
| OLD | NEW |