Chromium Code Reviews| Index: Source/core/loader/cache/CachedResourceLoader.cpp |
| diff --git a/Source/core/loader/cache/CachedResourceLoader.cpp b/Source/core/loader/cache/CachedResourceLoader.cpp |
| index 4ecebcb10df71b98a01e79d4d9a4ead607f57456..2a3f01e2c3bd327e3e8c5e7ac851983e08a8d446 100644 |
| --- a/Source/core/loader/cache/CachedResourceLoader.cpp |
| +++ b/Source/core/loader/cache/CachedResourceLoader.cpp |
| @@ -707,6 +707,11 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida |
| return Reload; |
| } |
| + // Do not load from cache if images are not enabled. The load for this image will be blocked |
| + // in CachedImage::load. |
| + if (CachedResourceRequest::DeferredByClient == defer) |
| + return Reload; |
| + |
| // Always use data uris. |
| // FIXME: Extend this to non-images. |
| if (type == CachedResource::ImageResource && request.url().protocolIsData()) |
|
abarth-chromium
2013/06/13 04:38:51
Ah, interesting.
|
| @@ -721,11 +726,6 @@ CachedResourceLoader::RevalidationPolicy CachedResourceLoader::determineRevalida |
| if (request.isConditional()) |
| return Reload; |
| - // Do not load from cache if images are not enabled. The load for this image will be blocked |
| - // in CachedImage::load. |
| - if (CachedResourceRequest::DeferredByClient == defer) |
| - return Reload; |
| - |
| // Don't reload resources while pasting. |
| if (m_allowStaleResources) |
| return Use; |