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 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
751 if (type != Resource::Raw) { | 751 if (type != Resource::Raw) { |
752 if (!context().isLoadComplete() && m_validatedURLs.contains(existingReso
urce->url())) | 752 if (!context().isLoadComplete() && m_validatedURLs.contains(existingReso
urce->url())) |
753 return Use; | 753 return Use; |
754 if (existingResource->isLoading()) | 754 if (existingResource->isLoading()) |
755 return Use; | 755 return Use; |
756 } | 756 } |
757 | 757 |
758 if (request.getCachePolicy() == WebCachePolicy::BypassingCache) | 758 if (request.getCachePolicy() == WebCachePolicy::BypassingCache) |
759 return Reload; | 759 return Reload; |
760 | 760 |
| 761 if (request.getCachePolicy() == WebCachePolicy::ReturnCacheDataElseLoad) |
| 762 return Reload; |
| 763 |
761 // CachePolicyReload always reloads | 764 // CachePolicyReload always reloads |
762 if (cachePolicy == CachePolicyReload) { | 765 if (cachePolicy == CachePolicyReload) { |
763 RESOURCE_LOADING_DVLOG(1) << "ResourceFetcher::determineRevalidationPoli
cy reloading due to CachePolicyReload."; | 766 RESOURCE_LOADING_DVLOG(1) << "ResourceFetcher::determineRevalidationPoli
cy reloading due to CachePolicyReload."; |
764 return Reload; | 767 return Reload; |
765 } | 768 } |
766 | 769 |
767 // We'll try to reload the resource if it failed last time. | 770 // We'll try to reload the resource if it failed last time. |
768 if (existingResource->errorOccurred()) { | 771 if (existingResource->errorOccurred()) { |
769 RESOURCE_LOADING_DVLOG(1) << "ResourceFetcher::determineRevalidationPoli
cye reloading due to resource being in the error state"; | 772 RESOURCE_LOADING_DVLOG(1) << "ResourceFetcher::determineRevalidationPoli
cye reloading due to resource being in the error state"; |
770 return Reload; | 773 return Reload; |
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1323 visitor->trace(m_context); | 1326 visitor->trace(m_context); |
1324 visitor->trace(m_archive); | 1327 visitor->trace(m_archive); |
1325 visitor->trace(m_loaders); | 1328 visitor->trace(m_loaders); |
1326 visitor->trace(m_nonBlockingLoaders); | 1329 visitor->trace(m_nonBlockingLoaders); |
1327 visitor->trace(m_documentResources); | 1330 visitor->trace(m_documentResources); |
1328 visitor->trace(m_preloads); | 1331 visitor->trace(m_preloads); |
1329 visitor->trace(m_resourceTimingInfoMap); | 1332 visitor->trace(m_resourceTimingInfoMap); |
1330 } | 1333 } |
1331 | 1334 |
1332 } // namespace blink | 1335 } // namespace blink |
OLD | NEW |