| Index: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| diff --git a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| index 4f63ece7f63ceceb57ed50d1d1c235aeb163cbbb..3044e4e326a24169c1175de2714dda2e48f7b946 100644
|
| --- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| +++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
|
| @@ -447,7 +447,7 @@ PassRefPtrWillBeRawPtr<Resource> ResourceFetcher::requestResource(FetchRequest&
|
|
|
| updateMemoryCacheStats(resource.get(), policy, request, factory, isStaticData);
|
|
|
| - initializeResourceRequest(request.mutableResourceRequest(), factory.type());
|
| + initializeResourceRequest(request.mutableResourceRequest(), factory.type(), request.defer());
|
| switch (policy) {
|
| case Reload:
|
| memoryCache()->remove(resource.get());
|
| @@ -525,10 +525,10 @@ void ResourceFetcher::determineRequestContext(ResourceRequest& request, Resource
|
| determineRequestContext(request, type, context().isMainFrame());
|
| }
|
|
|
| -void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resource::Type type)
|
| +void ResourceFetcher::initializeResourceRequest(ResourceRequest& request, Resource::Type type, FetchRequest::DeferOption defer)
|
| {
|
| if (request.getCachePolicy() == UseProtocolCachePolicy)
|
| - request.setCachePolicy(context().resourceRequestCachePolicy(request, type));
|
| + request.setCachePolicy(context().resourceRequestCachePolicy(request, type, defer));
|
| if (request.requestContext() == WebURLRequest::RequestContextUnspecified)
|
| determineRequestContext(request, type);
|
| if (type == Resource::LinkPrefetch)
|
|
|