| Index: third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h
|
| diff --git a/third_party/WebKit/public/web/WebContentSecurityPolicy.h b/third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h
|
| similarity index 61%
|
| rename from third_party/WebKit/public/web/WebContentSecurityPolicy.h
|
| rename to third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h
|
| index 704d43dc676bff887bddddb9afc9901e6149b988..2e1d0bd5caa30547f65f69e5a1f03b2cf27ddddc 100644
|
| --- a/third_party/WebKit/public/web/WebContentSecurityPolicy.h
|
| +++ b/third_party/WebKit/public/platform/WebContentSecurityPolicyStruct.h
|
| @@ -28,21 +28,46 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef WebContentSecurityPolicy_h
|
| -#define WebContentSecurityPolicy_h
|
| +#ifndef WebContentSecurityPolicyStruct_h
|
| +#define WebContentSecurityPolicyStruct_h
|
| +
|
| +#include "public/platform/WebContentSecurityPolicy.h"
|
| +#include "public/platform/WebString.h"
|
| +#include "public/platform/WebVector.h"
|
|
|
| namespace blink {
|
|
|
| -enum WebContentSecurityPolicyType {
|
| - WebContentSecurityPolicyTypeReport,
|
| - WebContentSecurityPolicyTypeEnforce,
|
| - WebContentSecurityPolicyTypeLast = WebContentSecurityPolicyTypeEnforce
|
| +enum WebWildcardDisposition {
|
| + WebWildcardDispositionNoWildcard,
|
| + WebWildcardDispositionHasWildcard
|
| +};
|
| +
|
| +struct WebContentSecurityPolicySourceExpression {
|
| + WebString scheme;
|
| + WebString host;
|
| + WebWildcardDisposition isHostWildcard;
|
| + int port;
|
| + WebWildcardDisposition isPortWildcard;
|
| + WebString path;
|
| +};
|
| +
|
| +struct WebContentSecurityPolicySourceList {
|
| + bool allowSelf;
|
| + bool allowStar;
|
| + WebVector<WebContentSecurityPolicySourceExpression> sources;
|
| +};
|
| +
|
| +struct WebContentSecurityPolicyDirective {
|
| + WebString name;
|
| + WebContentSecurityPolicySourceList sourceList;
|
| };
|
|
|
| -enum WebContentSecurityPolicySource {
|
| - WebContentSecurityPolicySourceHTTP,
|
| - WebContentSecurityPolicySourceMeta,
|
| - WebContentSecurityPolicySourceLast = WebContentSecurityPolicySourceMeta
|
| +struct WebContentSecurityPolicyPolicy {
|
| + WebContentSecurityPolicyType disposition;
|
| + WebContentSecurityPolicySource source;
|
| + WebVector<WebContentSecurityPolicyDirective> directives;
|
| + WebVector<WebString> reportEndpoints;
|
| + WebString header;
|
| };
|
|
|
| } // namespace blink
|
|
|