third_party/WebKit/Source/core/loader/FrameFetchContext.cpp - Issue 1903953002: [DevTools] Move from InstrumentingAgents to InstrumentingSessions.

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/FrameFetchContext.cpp

Issue 1903953002: [DevTools] Move from InstrumentingAgents to InstrumentingSessions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove-discard-agent

Patch Set: rebased 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

« no previous file with comments | « third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp ('k') | third_party/WebKit/Source/core/testing/Internals.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 27d945ba2eca6e0cfe8e6ccd10bfb288f1749d37..5cf968bc75f439b8ce406bee86e6709165e52fcf 100644

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

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

@@ -47,7 +47,6 @@

#include "core/inspector/InspectorInstrumentation.h"

#include "core/inspector/InspectorResourceAgent.h"

#include "core/inspector/InspectorTraceEvents.h"

-#include "core/inspector/InstrumentingAgents.h"

#include "core/loader/DocumentLoader.h"

#include "core/loader/FrameLoader.h"

#include "core/loader/FrameLoaderClient.h"

@@ -446,11 +445,8 @@ bool FrameFetchContext::allowResponse(Resource::Type type, const ResourceRequest

ResourceRequestBlockedReason FrameFetchContext::canRequestInternal(Resource::Type type, const ResourceRequest& resourceRequest, const KURL& url, const ResourceLoaderOptions& options, bool forPreload, FetchRequest::OriginRestriction originRestriction, ContentSecurityPolicy::RedirectStatus redirectStatus) const

{

- InstrumentingAgents* agents = InspectorInstrumentation::instrumentingAgentsFor(frame());

- if (agents && agents->inspectorResourceAgent()) {

- if (agents->inspectorResourceAgent()->shouldBlockRequest(resourceRequest))

- return ResourceRequestBlockedReasonInspector;

- }

+ if (InspectorInstrumentation::shouldBlockRequest(frame(), resourceRequest))

+ return ResourceRequestBlockedReasonInspector;

SecurityOrigin* securityOrigin = options.securityOrigin.get();

if (!securityOrigin && m_document)