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 11 matching lines...) Expand all Loading... |
22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "config.h" | 31 #include "config.h" |
32 #include "bindings/v8/DOMWrapperWorld.h" | 32 #include "bindings/core/v8/DOMWrapperWorld.h" |
33 | 33 |
| 34 #include "bindings/core/v8/DOMDataStore.h" |
| 35 #include "bindings/core/v8/ScriptController.h" |
| 36 #include "bindings/core/v8/V8Binding.h" |
| 37 #include "bindings/core/v8/V8DOMActivityLogger.h" |
| 38 #include "bindings/core/v8/V8DOMWrapper.h" |
34 #include "bindings/core/v8/V8Window.h" | 39 #include "bindings/core/v8/V8Window.h" |
35 #include "bindings/v8/DOMDataStore.h" | 40 #include "bindings/core/v8/V8WindowShell.h" |
36 #include "bindings/v8/ScriptController.h" | 41 #include "bindings/core/v8/WrapperTypeInfo.h" |
37 #include "bindings/v8/V8Binding.h" | |
38 #include "bindings/v8/V8DOMActivityLogger.h" | |
39 #include "bindings/v8/V8DOMWrapper.h" | |
40 #include "bindings/v8/V8WindowShell.h" | |
41 #include "bindings/v8/WrapperTypeInfo.h" | |
42 #include "core/dom/ExecutionContext.h" | 42 #include "core/dom/ExecutionContext.h" |
43 #include "wtf/HashTraits.h" | 43 #include "wtf/HashTraits.h" |
44 #include "wtf/StdLibExtras.h" | 44 #include "wtf/StdLibExtras.h" |
45 | 45 |
46 namespace WebCore { | 46 namespace WebCore { |
47 | 47 |
48 unsigned DOMWrapperWorld::isolatedWorldCount = 0; | 48 unsigned DOMWrapperWorld::isolatedWorldCount = 0; |
49 DOMWrapperWorld* DOMWrapperWorld::worldOfInitializingWindow = 0; | 49 DOMWrapperWorld* DOMWrapperWorld::worldOfInitializingWindow = 0; |
50 | 50 |
51 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(int worldId, int extensionGr
oup) | 51 PassRefPtr<DOMWrapperWorld> DOMWrapperWorld::create(int worldId, int extensionGr
oup) |
(...skipping 142 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 |