third_party/WebKit/Source/core/fetch/ResourceFetcher.cpp - Issue 1849223002: Blocking synchronous and third party doc.written scripts

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: Tests modified as per feedback and code comments added 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

« third_party/WebKit/LayoutTests/http/tests/loading/doc-write-sync-third-party-script-block3-expected.txt ('K') | « third_party/WebKit/Source/core/fetch/ResourceFetcher.h ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.h » ('j') | third_party/WebKit/Source/core/loader/FrameFetchContext.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..757978123bdc5f836c767eeb44153f6f957b9048 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)

@@ -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(), FetchRequest::NoDefer);

jkarlin 2016/04/06 14:55:31 Why is this NoDefer? Shouldn't this be request.def

shivanisha 2016/04/06 20:40:10 Updating. I initially thought it is a fresh reques

const AtomicString& lastModified = resource->response().httpHeaderField(HTTPNames::Last_Modified);

const AtomicString& eTag = resource->response().httpHeaderField(HTTPNames::ETag);