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 17 matching lines...) Expand all Loading... |
28 #include "core/dom/SecurityContext.h" | 28 #include "core/dom/SecurityContext.h" |
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 { | 39 { |
39 } | 40 } |
40 | 41 |
41 SecurityContext::~SecurityContext() | 42 SecurityContext::~SecurityContext() |
42 { | 43 { |
43 } | 44 } |
44 | 45 |
45 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigi
n) | 46 void SecurityContext::setSecurityOrigin(PassRefPtr<SecurityOrigin> securityOrigi
n) |
46 { | 47 { |
47 m_securityOrigin = securityOrigin; | 48 m_securityOrigin = securityOrigin; |
(...skipping 21 matching lines...) Expand all Loading... |
69 { | 70 { |
70 m_sandboxFlags |= mask; | 71 m_sandboxFlags |= mask; |
71 | 72 |
72 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { | 73 if (isSandboxed(SandboxOrigin) && securityOrigin() && !securityOrigin()->isU
nique()) { |
73 setSecurityOrigin(SecurityOrigin::createUnique()); | 74 setSecurityOrigin(SecurityOrigin::createUnique()); |
74 didUpdateSecurityOrigin(); | 75 didUpdateSecurityOrigin(); |
75 } | 76 } |
76 } | 77 } |
77 | 78 |
78 } | 79 } |
OLD | NEW |