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

Unified Diff: Source/core/fetch/ResourceLoaderOptions.h

Issue 23437013: Consider "mixed content XHR" as mixed script instead of mixed display. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Tidy. Created 7 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/fetch/ResourceFetcher.cpp ('k') | Source/core/loader/DocumentThreadableLoader.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/fetch/ResourceLoaderOptions.h
diff --git a/Source/core/fetch/ResourceLoaderOptions.h b/Source/core/fetch/ResourceLoaderOptions.h
index 187efc3ac96c700ada8fe8b310b3e569ff39bb51..be960d3e79dc646bb404afe9645330e669f9866b 100644
--- a/Source/core/fetch/ResourceLoaderOptions.h
+++ b/Source/core/fetch/ResourceLoaderOptions.h
@@ -90,6 +90,13 @@ enum CredentialRequest {
ClientDidNotRequestCredentials
};
+enum MixedContentBlockingTreatment {
+ TreatAsDefaultForType,
+ TreatAsPassiveContent,
+ TreatAsActiveContent,
+ TreatAsAlwaysAllowedContent
+};
+
struct ResourceLoaderOptions {
ResourceLoaderOptions()
: sendLoadCallbacks(DoNotSendCallbacks)
@@ -102,6 +109,7 @@ struct ResourceLoaderOptions {
, contentSecurityPolicyOption(CheckContentSecurityPolicy)
, requestOriginPolicy(UseDefaultOriginRestrictionsForType)
, requestInitiatorContext(DocumentContext)
+ , mixedContentBlockingTreatment(TreatAsDefaultForType)
{
}
@@ -126,8 +134,10 @@ struct ResourceLoaderOptions {
, contentSecurityPolicyOption(contentSecurityPolicyOption)
, requestOriginPolicy(requestOriginPolicy)
, requestInitiatorContext(requestInitiatorContext)
+ , mixedContentBlockingTreatment(TreatAsDefaultForType)
{
}
+
SendCallbackPolicy sendLoadCallbacks;
ContentSniffingPolicy sniffContent;
DataBufferingPolicy dataBufferingPolicy;
@@ -139,6 +149,7 @@ struct ResourceLoaderOptions {
FetchInitiatorInfo initiatorInfo;
RequestOriginPolicy requestOriginPolicy;
RequestInitiatorContext requestInitiatorContext;
+ MixedContentBlockingTreatment mixedContentBlockingTreatment;
};
} // namespace WebCore
« no previous file with comments | « Source/core/fetch/ResourceFetcher.cpp ('k') | Source/core/loader/DocumentThreadableLoader.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698