third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp - Issue 1829803002: [WeakMemoryCache] Do not lookup MemoryCache when adding resource to Inspector

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

Issue 1829803002: [WeakMemoryCache] Do not lookup MemoryCache when adding resource to Inspector (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@MemoryCache_MakeWeak2d

Patch Set: Do not expose DocumentLoader::mainResource() Created 4 years, 7 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/loader/DocumentLoader.cpp ('k') | third_party/WebKit/Source/core/loader/FrameFetchContext.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

index 8502e4b3e5ee2aa623430bb3177ee2daf4678638..0161f773d04f37ed07f0346566875428c3eebdff 100644

--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp

@@ -477,7 +477,7 @@ void DocumentThreadableLoader::redirectReceived(Resource* resource, ResourceRequ

} else if (m_options.crossOriginRequestPolicy == UseAccessControl) {

--m_corsRedirectLimit;

- InspectorInstrumentation::didReceiveCORSRedirectResponse(document().frame(), resource->identifier(), document().frame()->loader().documentLoader(), redirectResponse, 0);

+ InspectorInstrumentation::didReceiveCORSRedirectResponse(document().frame(), resource->identifier(), document().frame()->loader().documentLoader(), redirectResponse, resource);

bool allowRedirect = false;

String accessControlErrorDescription;

@@ -635,7 +635,7 @@ void DocumentThreadableLoader::reportResponseReceived(unsigned long identifier,

return;

DocumentLoader* loader = frame->loader().documentLoader();

TRACE_EVENT_INSTANT1("devtools.timeline", "ResourceReceiveResponse", TRACE_EVENT_SCOPE_THREAD, "data", InspectorReceiveResponseEvent::data(identifier, frame, response));

- InspectorInstrumentation::didReceiveResourceResponse(frame, identifier, loader, response, resource() ? resource()->loader() : 0);

+ InspectorInstrumentation::didReceiveResourceResponse(frame, identifier, loader, response, resource());

frame->console().reportResourceResponseReceived(loader, identifier, response);

}