Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(329)

Unified Diff: third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp

Issue 1849223002: Blocking synchronous and third party doc.written scripts (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolved conflicts with latest Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 906ffa18187f55a49a7b4de2e14e5ab01e48fcbd..6d7168caac6165916efb968d6ed27b396e5748ef 100644
--- a/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
+++ b/third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp
@@ -446,7 +446,7 @@ Resource* ResourceFetcher::requestResource(FetchRequest& request, const Resource
updateMemoryCacheStats(resource, policy, request, factory, isStaticData);
- initializeResourceRequest(request.mutableResourceRequest(), factory.type());
+ initializeResourceRequest(request.mutableResourceRequest(), factory.type(), request.defer());
switch (policy) {
case Reload:
memoryCache()->remove(resource);
@@ -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() == WebCachePolicy::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)
@@ -548,7 +548,7 @@ void ResourceFetcher::initializeRevalidation(const FetchRequest& request, Resour
ResourceRequest revalidatingRequest(resource->resourceRequest());
revalidatingRequest.clearHTTPReferrer();
- initializeResourceRequest(revalidatingRequest, resource->getType());
+ initializeResourceRequest(revalidatingRequest, resource->getType(), request.defer());
const AtomicString& lastModified = resource->response().httpHeaderField(HTTPNames::Last_Modified);
const AtomicString& eTag = resource->response().httpHeaderField(HTTPNames::ETag);
« no previous file with comments | « third_party/WebKit/Source/core/fetch/ResourceFetcher.h ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698