| 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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 | 50 |
| 51 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(int worldId, int extensionGr
oup) | 51 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(int worldId, int extensionGr
oup) |
| 52 { | 52 { |
| 53 return adoptRef(new DOMWrapperWorld(worldId, extensionGroup)); | 53 return adoptRef(new DOMWrapperWorld(worldId, extensionGroup)); |
| 54 } | 54 } |
| 55 | 55 |
| 56 DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup) | 56 DOMWrapperWorld::DOMWrapperWorld(int worldId, int extensionGroup) |
| 57 : m_worldId(worldId) | 57 : m_worldId(worldId) |
| 58 , m_extensionGroup(extensionGroup) | 58 , m_extensionGroup(extensionGroup) |
| 59 , m_domDataStore(adoptPtr(new DOMDataStore(isMainWorld()))) | 59 , m_domDataStore(adoptPtr(new DOMDataStore(isMainWorld()))) |
| 60 , m_activityLogger(0) | |
| 61 { | 60 { |
| 62 } | 61 } |
| 63 | 62 |
| 64 DOMWrapperWorld& DOMWrapperWorld::mainWorld() | 63 DOMWrapperWorld& DOMWrapperWorld::mainWorld() |
| 65 { | 64 { |
| 66 ASSERT(isMainThread()); | 65 ASSERT(isMainThread()); |
| 67 DEFINE_STATIC_REF(DOMWrapperWorld, cachedMainWorld, (DOMWrapperWorld::create
(MainWorldId, mainWorldExtensionGroup))); | 66 DEFINE_STATIC_REF(DOMWrapperWorld, cachedMainWorld, (DOMWrapperWorld::create
(MainWorldId, mainWorldExtensionGroup))); |
| 68 return *cachedMainWorld; | 67 return *cachedMainWorld; |
| 69 } | 68 } |
| 70 | 69 |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const S
tring& policy) | 183 void DOMWrapperWorld::setIsolatedWorldContentSecurityPolicy(int worldId, const S
tring& policy) |
| 185 { | 184 { |
| 186 ASSERT(isIsolatedWorldId(worldId)); | 185 ASSERT(isIsolatedWorldId(worldId)); |
| 187 if (!policy.isEmpty()) | 186 if (!policy.isEmpty()) |
| 188 isolatedWorldContentSecurityPolicies().set(worldId, true); | 187 isolatedWorldContentSecurityPolicies().set(worldId, true); |
| 189 else | 188 else |
| 190 isolatedWorldContentSecurityPolicies().remove(worldId); | 189 isolatedWorldContentSecurityPolicies().remove(worldId); |
| 191 } | 190 } |
| 192 | 191 |
| 193 } // namespace WebCore | 192 } // namespace WebCore |
| OLD | NEW |