| 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 25 matching lines...) Expand all Loading... |
| 36 #include "bindings/core/v8/V8Binding.h" | 36 #include "bindings/core/v8/V8Binding.h" |
| 37 #include "bindings/core/v8/V8DOMActivityLogger.h" | 37 #include "bindings/core/v8/V8DOMActivityLogger.h" |
| 38 #include "bindings/core/v8/V8DOMWrapper.h" | 38 #include "bindings/core/v8/V8DOMWrapper.h" |
| 39 #include "bindings/core/v8/V8Window.h" | 39 #include "bindings/core/v8/V8Window.h" |
| 40 #include "bindings/core/v8/V8WindowShell.h" | 40 #include "bindings/core/v8/V8WindowShell.h" |
| 41 #include "bindings/core/v8/WrapperTypeInfo.h" | 41 #include "bindings/core/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 blink { |
| 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) |
| 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) |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 | 190 |
| 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 blink |
| OLD | NEW |