Source/core/css/CSSFontFaceSrcValue.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/css/CSSFontFaceSrcValue.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

« no previous file with comments | « LayoutTests/http/tests/inspector-protocol/resources/passive-mixed-content-iframe.html ('k') | Source/core/css/CSSImageValue.cpp » ('j') | Source/core/inspector/InspectorResourceAgent.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSFontFaceSrcValue.cpp

diff --git a/Source/core/css/CSSFontFaceSrcValue.cpp b/Source/core/css/CSSFontFaceSrcValue.cpp

index 45eb768bd72bc920dd70ba61aef74087f4a50088..6ba78a9e18e9ad48f2ae298fcbc7081b335682f6 100644

--- a/Source/core/css/CSSFontFaceSrcValue.cpp

+++ b/Source/core/css/CSSFontFaceSrcValue.cpp

@@ -109,10 +109,11 @@ void CSSFontFaceSrcValue::restoreCachedResourceIfNeeded(Document* document)

if (document->fetcher()->cachedResource(KURL(ParsedURLString, resourceURL)))

return;

+ const ResourceRequest& lastResourceRequest = m_fetched->lastResourceRequest();

FetchRequest request(ResourceRequest(resourceURL), FetchInitiatorTypeNames::css);

request.setContentSecurityCheck(m_shouldCheckContentSecurityPolicy);

- MixedContentChecker::shouldBlockFetch(document->frame(), m_fetched->lastResourceRequest(),

- m_fetched->lastResourceRequest().url(), MixedContentChecker::SendReport);

+ MixedContentChecker::shouldBlockFetch(document->frame(), lastResourceRequest.requestContext(), lastResourceRequest.frameType(),

+ lastResourceRequest.url(), MixedContentChecker::SendReport);

document->fetcher()->requestLoadStarted(m_fetched.get(), request, ResourceFetcher::ResourceLoadingFromCache);

}