| 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 19 matching lines...) Expand all Loading... |
| 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_insecureRequestsPolicy(InsecureRequestsDoNotUpgrade) | 39 , m_insecureRequestsPolicy(InsecureRequestsDoNotUpgrade) |
| 40 , m_enforceStrictMixedContentChecking(false) |
| 40 { | 41 { |
| 41 } | 42 } |
| 42 | 43 |
| 43 SecurityContext::~SecurityContext() | 44 SecurityContext::~SecurityContext() |
| 44 { | 45 { |
| 45 } | 46 } |
| 46 | 47 |
| 47 DEFINE_TRACE(SecurityContext) | 48 DEFINE_TRACE(SecurityContext) |
| 48 { | 49 { |
| 49 visitor->trace(m_contentSecurityPolicy); | 50 visitor->trace(m_contentSecurityPolicy); |
| (...skipping 26 matching lines...) Expand all Loading... |
| 76 { | 77 { |
| 77 m_sandboxFlags |= mask; | 78 m_sandboxFlags |= mask; |
| 78 | 79 |
| 79 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { | 80 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { |
| 80 setSecurityOrigin(SecurityOrigin::createUnique()); | 81 setSecurityOrigin(SecurityOrigin::createUnique()); |
| 81 didUpdateSecurityOrigin(); | 82 didUpdateSecurityOrigin(); |
| 82 } | 83 } |
| 83 } | 84 } |
| 84 | 85 |
| 85 } | 86 } |
| OLD | NEW |