Source/core/css/CSSImageValue.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/CSSImageValue.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 | « Source/core/css/CSSFontFaceSrcValue.cpp ('k') | Source/core/fetch/CachingCorrectnessTest.cpp » ('j') | Source/core/inspector/InspectorResourceAgent.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/css/CSSImageValue.cpp

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

index c4c6b7908d4f683764658f06c2e0ec6c29f2ac86..301c2fb423c22ef9c39d9f972b965833ae819e8d 100644

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

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

@@ -86,9 +86,10 @@ void CSSImageValue::restoreCachedResourceIfNeeded(Document& document)

if (!resource)

return;

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

FetchRequest request(ResourceRequest(m_absoluteURL), m_initiatorName.isEmpty() ? FetchInitiatorTypeNames::css : m_initiatorName, resource->options());

- MixedContentChecker::shouldBlockFetch(document.frame(), resource->lastResourceRequest(),

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

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

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

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

}