third_party/WebKit/Source/core/loader/FrameFetchContext.h - Issue 1889973002: Refactoring starting a resource load

Unified Diff: third_party/WebKit/Source/core/loader/FrameFetchContext.h

Issue 1889973002: Refactoring starting a resource load (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix a browser_test Created 4 years, 6 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

« no previous file with comments | « third_party/WebKit/Source/core/fetch/ScriptResource.h ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/FrameFetchContext.h

diff --git a/third_party/WebKit/Source/core/loader/FrameFetchContext.h b/third_party/WebKit/Source/core/loader/FrameFetchContext.h

index b8f97c8509dd824a7cc2557f608c7420a49283f9..b3a3a4f7c6446229f0268c5bf31276fce6b1410e 100644

--- a/third_party/WebKit/Source/core/loader/FrameFetchContext.h

+++ b/third_party/WebKit/Source/core/loader/FrameFetchContext.h

@@ -73,7 +73,7 @@ public:

WebCachePolicy resourceRequestCachePolicy(const ResourceRequest&, Resource::Type, FetchRequest::DeferOption) const override;

void dispatchDidChangeResourcePriority(unsigned long identifier, ResourceLoadPriority, int intraPriorityValue) override;

void dispatchWillSendRequest(unsigned long identifier, ResourceRequest&, const ResourceResponse& redirectResponse, const FetchInitiatorInfo& = FetchInitiatorInfo()) override;

- void dispatchDidLoadResourceFromMemoryCache(Resource*, WebURLRequest::FrameType, WebURLRequest::RequestContext) override;

+ void dispatchDidLoadResourceFromMemoryCache(unsigned long identifier, Resource*, WebURLRequest::FrameType, WebURLRequest::RequestContext) override;

void dispatchDidReceiveResponse(unsigned long identifier, const ResourceResponse&, WebURLRequest::FrameType, WebURLRequest::RequestContext, Resource*) override;

void dispatchDidReceiveData(unsigned long identifier, const char* data, int dataLength, int encodedDataLength) override;

void dispatchDidDownloadData(unsigned long identifier, int dataLength, int encodedDataLength) override;

@@ -81,7 +81,7 @@ public:

void dispatchDidFail(unsigned long identifier, const ResourceError&, bool isInternalRequest) override;

bool shouldLoadNewResource(Resource::Type) const override;

- void willStartLoadingResource(Resource*, ResourceRequest&) override;

+ void willStartLoadingResource(unsigned long identifier, ResourceRequest&, Resource::Type) override;

void didLoadResource(Resource*) override;

void addResourceTiming(const ResourceTimingInfo&) override;

@@ -125,6 +125,8 @@ private:

ResourceRequestBlockedReason canRequestInternal(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction, ResourceRequest::RedirectStatus) const;

bool contentSecurityPolicyBlocksRequest(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, ResourceRequest::RedirectStatus) const;

+ void prepareRequest(unsigned long identifier, ResourceRequest&, const ResourceResponse&);

// FIXME: Oilpan: Ideally this should just be a traced Member but that will

// currently leak because ComputedStyle and its data are not on the heap.

// See crbug.com/383860 for details.