| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 114 |
| 115 map.remove(it); | 115 map.remove(it); |
| 116 isolatedWorldCount--; | 116 isolatedWorldCount--; |
| 117 } | 117 } |
| 118 | 118 |
| 119 void DOMWrapperWorld::dispose() | 119 void DOMWrapperWorld::dispose() |
| 120 { | 120 { |
| 121 m_domDataStore.clear(); | 121 m_domDataStore.clear(); |
| 122 } | 122 } |
| 123 | 123 |
| 124 #ifndef NDEBUG | 124 #if ENABLE(ASSERT) |
| 125 static bool isIsolatedWorldId(int worldId) | 125 static bool isIsolatedWorldId(int worldId) |
| 126 { | 126 { |
| 127 return MainWorldId < worldId && worldId < IsolatedWorldIdLimit; | 127 return MainWorldId < worldId && worldId < IsolatedWorldIdLimit; |
| 128 } | 128 } |
| 129 #endif | 129 #endif |
| 130 | 130 |
| 131 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, in
t extensionGroup) | 131 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, in
t extensionGroup) |
| 132 { | 132 { |
| 133 ASSERT(isIsolatedWorldId(worldId)); | 133 ASSERT(isIsolatedWorldId(worldId)); |
| 134 | 134 |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 191 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const S
tring& policy) | 191 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const S
tring& policy) |
| 192 { | 192 { |
| 193 ASSERT(isIsolatedWorldId(worldId)); | 193 ASSERT(isIsolatedWorldId(worldId)); |
| 194 if (!policy.isEmpty()) | 194 if (!policy.isEmpty()) |
| 195 isolatedWorldContentSecurityPolicies().set(worldId, true); | 195 isolatedWorldContentSecurityPolicies().set(worldId, true); |
| 196 else | 196 else |
| 197 isolatedWorldContentSecurityPolicies().remove(worldId); | 197 isolatedWorldContentSecurityPolicies().remove(worldId); |
| 198 } | 198 } |
| 199 | 199 |
| 200 } // namespace WebCore | 200 } // namespace WebCore |
| OLD | NEW |