OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008, 2009, 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2008, 2009, 2011 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/V8WindowShell.h" | 32 #include "bindings/core/v8/V8WindowShell.h" |
33 | 33 |
| 34 #include "bindings/core/v8/DOMWrapperWorld.h" |
| 35 #include "bindings/core/v8/ScriptController.h" |
| 36 #include "bindings/core/v8/V8Binding.h" |
| 37 #include "bindings/core/v8/V8DOMActivityLogger.h" |
34 #include "bindings/core/v8/V8Document.h" | 38 #include "bindings/core/v8/V8Document.h" |
| 39 #include "bindings/core/v8/V8GCForContextDispose.h" |
35 #include "bindings/core/v8/V8HTMLCollection.h" | 40 #include "bindings/core/v8/V8HTMLCollection.h" |
36 #include "bindings/core/v8/V8HTMLDocument.h" | 41 #include "bindings/core/v8/V8HTMLDocument.h" |
| 42 #include "bindings/core/v8/V8HiddenValue.h" |
| 43 #include "bindings/core/v8/V8Initializer.h" |
| 44 #include "bindings/core/v8/V8ObjectConstructor.h" |
37 #include "bindings/core/v8/V8Window.h" | 45 #include "bindings/core/v8/V8Window.h" |
38 #include "bindings/v8/DOMWrapperWorld.h" | |
39 #include "bindings/v8/ScriptController.h" | |
40 #include "bindings/v8/V8Binding.h" | |
41 #include "bindings/v8/V8DOMActivityLogger.h" | |
42 #include "bindings/v8/V8GCForContextDispose.h" | |
43 #include "bindings/v8/V8HiddenValue.h" | |
44 #include "bindings/v8/V8Initializer.h" | |
45 #include "bindings/v8/V8ObjectConstructor.h" | |
46 #include "core/dom/ScriptForbiddenScope.h" | 46 #include "core/dom/ScriptForbiddenScope.h" |
47 #include "core/frame/LocalFrame.h" | 47 #include "core/frame/LocalFrame.h" |
48 #include "core/frame/csp/ContentSecurityPolicy.h" | 48 #include "core/frame/csp/ContentSecurityPolicy.h" |
49 #include "core/html/HTMLCollection.h" | 49 #include "core/html/HTMLCollection.h" |
50 #include "core/html/HTMLIFrameElement.h" | 50 #include "core/html/HTMLIFrameElement.h" |
51 #include "core/inspector/InspectorInstrumentation.h" | 51 #include "core/inspector/InspectorInstrumentation.h" |
52 #include "core/loader/DocumentLoader.h" | 52 #include "core/loader/DocumentLoader.h" |
53 #include "core/loader/FrameLoader.h" | 53 #include "core/loader/FrameLoader.h" |
54 #include "core/loader/FrameLoaderClient.h" | 54 #include "core/loader/FrameLoaderClient.h" |
55 #include "platform/RuntimeEnabledFeatures.h" | 55 #include "platform/RuntimeEnabledFeatures.h" |
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 | 495 |
496 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) | 496 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) |
497 { | 497 { |
498 ASSERT(m_world->isMainWorld()); | 498 ASSERT(m_world->isMainWorld()); |
499 if (!isContextInitialized()) | 499 if (!isContextInitialized()) |
500 return; | 500 return; |
501 setSecurityToken(origin); | 501 setSecurityToken(origin); |
502 } | 502 } |
503 | 503 |
504 } // WebCore | 504 } // WebCore |
OLD | NEW |