third_party/WebKit/Source/core/loader/DocumentLoader.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/DocumentLoader.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/inspector/InspectorResourceAgent.cpp ('k') | third_party/WebKit/Source/core/loader/DocumentThreadableLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index d393122b2c8f9f9091f11e79e3abbdf46024eb06..0a17529f93249e72c15c6b11671ad003d72fc766 100644

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

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

@@ -260,7 +260,7 @@ void DocumentLoader::notifyFinished(Resource* resource)

// TODO(mkwst): Magic numbers bad.

if (m_mainResource->resourceError().errorCode() == -27)

- InspectorInstrumentation::canceledAfterReceivedResourceResponse(m_frame, this, mainResourceIdentifier(), resource->response());

+ InspectorInstrumentation::canceledAfterReceivedResourceResponse(m_frame, this, mainResourceIdentifier(), resource->response(), m_mainResource.get());

frameLoader()->loadFailed(this, m_mainResource->resourceError());

clearMainResourceHandle();

@@ -357,7 +357,7 @@ bool DocumentLoader::shouldContinueForResponse() const

void DocumentLoader::cancelLoadAfterCSPDenied(const ResourceResponse& response)

{

- InspectorInstrumentation::canceledAfterReceivedResourceResponse(m_frame, this, mainResourceIdentifier(), response);

+ InspectorInstrumentation::canceledAfterReceivedResourceResponse(m_frame, this, mainResourceIdentifier(), response, m_mainResource.get());

setWasBlockedAfterCSP();

@@ -399,7 +399,7 @@ void DocumentLoader::responseReceived(Resource* resource, const ResourceResponse

m_mainResource->setDataBufferingPolicy(BufferData);

if (!shouldContinueForResponse()) {

- InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, m_mainResource->identifier(), m_response);

+ InspectorInstrumentation::continueWithPolicyIgnore(m_frame, this, m_mainResource->identifier(), m_response, m_mainResource.get());

m_fetcher->stopFetching();

return;

}