third_party/WebKit/Source/core/inspector/InspectorInstrumentation.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/inspector/InspectorInstrumentation.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: Rebase. 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/fetch/ResourceFetcher.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorInstrumentation.idl » ('j') | third_party/WebKit/Source/core/inspector/InspectorResourceAgent.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

diff --git a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

index 2919da4a23ffbb7d8d27df4d48a69babc7945db6..00bd75afcfc78502d81b1deaa913fadc2725d427 100644

--- a/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

+++ b/third_party/WebKit/Source/core/inspector/InspectorInstrumentation.cpp

@@ -45,6 +45,7 @@

#include "core/inspector/InspectorSession.h"

#include "core/inspector/MainThreadDebugger.h"

#include "core/inspector/WorkerInspectorController.h"

+#include "core/loader/DocumentLoader.h"

#include "core/page/Page.h"

#include "core/workers/MainThreadWorkletGlobalScope.h"

#include "core/workers/WorkerGlobalScope.h"

@@ -173,7 +174,8 @@ bool isDebuggerPaused(LocalFrame*)

void didReceiveResourceResponseButCanceled(LocalFrame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)

{

- didReceiveResourceResponse(frame, identifier, loader, r, 0);

+ RELEASE_ASSERT(loader);

+ didReceiveResourceResponse(frame, identifier, loader, r, loader->mainResource());

dgozman 2016/05/12 19:58:09 Let's pass Resource* explicitly to |canceledAfterR

hiroshige 2016/05/13 08:40:10 Done.

}

void canceledAfterReceivedResourceResponse(LocalFrame* frame, DocumentLoader* loader, unsigned long identifier, const ResourceResponse& r)