Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(370)

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
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);
}

Powered by Google App Engine
This is Rietveld 408576698