Chromium Code Reviews| Index: Source/core/loader/ResourceLoaderOptions.h |
| diff --git a/Source/core/loader/ResourceLoaderOptions.h b/Source/core/loader/ResourceLoaderOptions.h |
| index 88c1fc0359cdef2bae1674142450b74e0bc8cfd5..d45972ff7e5081ca24dc4407ac39d7ae9666a385 100644 |
| --- a/Source/core/loader/ResourceLoaderOptions.h |
| +++ b/Source/core/loader/ResourceLoaderOptions.h |
| @@ -60,6 +60,11 @@ enum SecurityCheckPolicy { |
| DoSecurityCheck |
| }; |
| +enum ContentSecurityPolicyCheck { |
| + CheckContentSecurityPolicy, |
| + DoNotCheckContentSecurityPolicy |
| +}; |
| + |
| struct ResourceLoaderOptions { |
| ResourceLoaderOptions() |
| : sendLoadCallbacks(DoNotSendCallbacks) |
| @@ -68,7 +73,8 @@ struct ResourceLoaderOptions { |
| , allowCredentials(DoNotAllowStoredCredentials) |
| , credentialsRequested(ClientDidNotRequestCredentials) |
| , crossOriginCredentialPolicy(DoNotAskClientForCrossOriginCredentials) |
| - , securityCheck(DoSecurityCheck) { } |
| + , securityCheck(DoSecurityCheck) |
| + , cspCheck(CheckContentSecurityPolicy) { } |
| ResourceLoaderOptions( |
| SendCallbackPolicy sendLoadCallbacks, |
| @@ -77,7 +83,8 @@ struct ResourceLoaderOptions { |
| StoredCredentials allowCredentials, |
| CredentialRequest credentialsRequested, |
| ClientCrossOriginCredentialPolicy crossOriginCredentialPolicy, |
| - SecurityCheckPolicy securityCheck) |
| + SecurityCheckPolicy securityCheck, |
| + ContentSecurityPolicyCheck cspCheck) |
| : sendLoadCallbacks(sendLoadCallbacks) |
| , sniffContent(sniffContent) |
| , dataBufferingPolicy(dataBufferingPolicy) |
| @@ -85,6 +92,7 @@ struct ResourceLoaderOptions { |
| , credentialsRequested(credentialsRequested) |
| , crossOriginCredentialPolicy(crossOriginCredentialPolicy) |
| , securityCheck(securityCheck) |
| + , cspCheck(cspCheck) |
| { |
| } |
| SendCallbackPolicy sendLoadCallbacks; |
| @@ -94,6 +102,7 @@ struct ResourceLoaderOptions { |
| CredentialRequest credentialsRequested; // Whether the client (e.g. XHR) wanted credentials in the first place. |
| ClientCrossOriginCredentialPolicy crossOriginCredentialPolicy; // Whether we will ask the client for credentials (if we allow credentials at all). |
| SecurityCheckPolicy securityCheck; |
| + ContentSecurityPolicyCheck cspCheck; |
|
abarth-chromium
2013/05/16 21:09:16
cspCheck -> contentSecurityPolicyOption
We prefer
jww
2013/05/16 21:37:46
Done.
|
| }; |
| } // namespace WebCore |