Source/core/fetch/ResourceFetcher.h - Issue 559333002: Revert of Revert of Mixed Content: Move subframe checks into ResourceFetcher.

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/fetch/ResourceFetcher.h

Issue 559333002: Revert of Revert of Mixed Content: Move subframe checks into ResourceFetcher. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 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/fetch/ResourceFetcher.h

diff --git a/Source/core/fetch/ResourceFetcher.h b/Source/core/fetch/ResourceFetcher.h

index 2ec7cafc20096d257019f8f95c8034212ed413c2..d91e1d9b1a364904c36ad94dfbb7f3567c54ff34 100644

--- a/Source/core/fetch/ResourceFetcher.h

+++ b/Source/core/fetch/ResourceFetcher.h

@@ -187,8 +187,8 @@

ResourceRequestCachePolicy resourceRequestCachePolicy(const ResourceRequest&, Resource::Type);

void addAdditionalRequestHeaders(ResourceRequest&, Resource::Type);

- bool canRequest(Resource::Type, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const;

- bool checkInsecureContent(Resource::Type, const KURL&, MixedContentBlockingTreatment) const;

+ bool canRequest(Resource::Type, const ResourceRequest&, const KURL&, const ResourceLoaderOptions&, bool forPreload, FetchRequest::OriginRestriction) const;

+ bool checkInsecureContent(Resource::Type, const KURL&, LocalFrame*, MixedContentBlockingTreatment) const;

static bool resourceNeedsLoad(Resource*, const FetchRequest&, RevalidationPolicy);

« no previous file with comments | « no previous file | Source/core/fetch/ResourceFetcher.cpp » ('j') | no next file with comments »