Source/core/loader/FrameFetchContext.cpp - Issue 1299493003: Attach mixed content status to resource requests when sent to devtools

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: Source/core/loader/FrameFetchContext.cpp

Issue 1299493003: Attach mixed content status to resource requests when sent to devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: isMixedContent() -> ContextTypeNotMixedContent, and rename devtools protocol enum Created 5 years, 4 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

« Source/core/inspector/InspectorResourceAgent.cpp ('K') | « Source/core/loader/FrameFetchContext.h ('k') | Source/core/loader/MixedContentChecker.h » ('j') | Source/core/loader/MixedContentChecker.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/loader/FrameFetchContext.cpp

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

index 9777c19c71ef2d4d4099050f06e3b73fcdb770ba..74b0d0184763794efb9c2f7cd82255e3db117818 100644

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

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

@@ -346,7 +346,7 @@ void FrameFetchContext::printAccessDeniedMessage(const KURL& url) const

frame()->document()->addConsoleMessage(ConsoleMessage::create(SecurityMessageSource, ErrorMessageLevel, message));

}

-bool FrameFetchContext::canRequest(Resource::Type type, const ResourceRequest& resourceRequest, const KURL& url, const ResourceLoaderOptions& options, bool forPreload, FetchRequest::OriginRestriction originRestriction) const

+bool FrameFetchContext::canRequest(Resource::Type type, ResourceRequest& resourceRequest, const KURL& url, const ResourceLoaderOptions& options, bool forPreload, FetchRequest::OriginRestriction originRestriction) const

{

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

if (!securityOrigin && m_document)

@@ -510,7 +510,7 @@ bool FrameFetchContext::canRequest(Resource::Type type, const ResourceRequest& r

MixedContentChecker::ReportingStatus mixedContentReporting = forPreload ?

MixedContentChecker::SuppressReport : MixedContentChecker::SendReport;

- return !MixedContentChecker::shouldBlockFetch(effectiveFrame, resourceRequest, url, mixedContentReporting);

+ return !MixedContentChecker::shouldBlockFetch(effectiveFrame, &resourceRequest, url, mixedContentReporting);

}

bool FrameFetchContext::isControlledByServiceWorker() const