| 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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 map.remove(it); | 115 map.remove(it); |
| 116 isolatedWorldCount--; | 116 isolatedWorldCount--; |
| 117 ASSERT(map.size() == isolatedWorldCount); | 117 ASSERT(map.size() == isolatedWorldCount); |
| 118 } | 118 } |
| 119 | 119 |
| 120 void DOMWrapperWorld::dispose() | 120 void DOMWrapperWorld::dispose() |
| 121 { | 121 { |
| 122 m_domDataStore.clear(); | 122 m_domDataStore.clear(); |
| 123 } | 123 } |
| 124 | 124 |
| 125 #ifndef NDEBUG | 125 #if ENABLE(ASSERT) |
| 126 static bool isIsolatedWorldId(int worldId) | 126 static bool isIsolatedWorldId(int worldId) |
| 127 { | 127 { |
| 128 return MainWorldId < worldId && worldId < IsolatedWorldIdLimit; | 128 return MainWorldId < worldId && worldId < IsolatedWorldIdLimit; |
| 129 } | 129 } |
| 130 #endif | 130 #endif |
| 131 | 131 |
| 132 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, in
t extensionGroup) | 132 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::ensureIsolatedWorld(int worldId, in
t extensionGroup) |
| 133 { | 133 { |
| 134 ASSERT(isIsolatedWorldId(worldId)); | 134 ASSERT(isIsolatedWorldId(worldId)); |
| 135 | 135 |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 194 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const S
tring& policy) | 194 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const S
tring& policy) |
| 195 { | 195 { |
| 196 ASSERT(isIsolatedWorldId(worldId)); | 196 ASSERT(isIsolatedWorldId(worldId)); |
| 197 if (!policy.isEmpty()) | 197 if (!policy.isEmpty()) |
| 198 isolatedWorldContentSecurityPolicies().set(worldId, true); | 198 isolatedWorldContentSecurityPolicies().set(worldId, true); |
| 199 else | 199 else |
| 200 isolatedWorldContentSecurityPolicies().remove(worldId); | 200 isolatedWorldContentSecurityPolicies().remove(worldId); |
| 201 } | 201 } |
| 202 | 202 |
| 203 } // namespace WebCore | 203 } // namespace WebCore |
| OLD | NEW |