OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011 Google Inc. All Rights Reserved. | 2 * Copyright (C) 2011 Google Inc. All Rights Reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 #include "core/frame/csp/ContentSecurityPolicy.h" | 30 #include "core/frame/csp/ContentSecurityPolicy.h" |
31 #include "platform/weborigin/SecurityOrigin.h" | 31 #include "platform/weborigin/SecurityOrigin.h" |
32 | 32 |
33 namespace blink { | 33 namespace blink { |
34 | 34 |
35 SecurityContext::SecurityContext() | 35 SecurityContext::SecurityContext() |
36 : m_haveInitializedSecurityOrigin(false) | 36 : m_haveInitializedSecurityOrigin(false) |
37 , m_sandboxFlags(SandboxNone) | 37 , m_sandboxFlags(SandboxNone) |
38 , m_hostedInReservedIPRange(false) | 38 , m_hostedInReservedIPRange(false) |
| 39 , m_insecureContentPolicy(InsecureContentIgnore) |
39 { | 40 { |
40 } | 41 } |
41 | 42 |
42 SecurityContext::~SecurityContext() | 43 SecurityContext::~SecurityContext() |
43 { | 44 { |
44 } | 45 } |
45 | 46 |
46 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigi
n) | 47 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigi
n) |
47 { | 48 { |
48 m_securityOrigin = securityOrigin; | 49 m_securityOrigin = securityOrigin; |
(...skipping 21 matching lines...) Expand all Loading... |
70 { | 71 { |
71 m_sandboxFlags |= mask; | 72 m_sandboxFlags |= mask; |
72 | 73 |
73 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { | 74 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { |
74 setSecurityOrigin(SecurityOrigin::createUnique()); | 75 setSecurityOrigin(SecurityOrigin::createUnique()); |
75 didUpdateSecurityOrigin(); | 76 didUpdateSecurityOrigin(); |
76 } | 77 } |
77 } | 78 } |
78 | 79 |
79 } | 80 } |
OLD | NEW |