| 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 13 matching lines...) Expand all Loading... |
| 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/v8/V8WindowShell.h" |
| 33 | 33 |
| 34 #include "RuntimeEnabledFeatures.h" | |
| 35 #include "bindings/core/v8/V8Document.h" | 34 #include "bindings/core/v8/V8Document.h" |
| 36 #include "bindings/core/v8/V8HTMLCollection.h" | 35 #include "bindings/core/v8/V8HTMLCollection.h" |
| 37 #include "bindings/core/v8/V8HTMLDocument.h" | 36 #include "bindings/core/v8/V8HTMLDocument.h" |
| 38 #include "bindings/core/v8/V8Window.h" | 37 #include "bindings/core/v8/V8Window.h" |
| 39 #include "bindings/v8/DOMWrapperWorld.h" | 38 #include "bindings/v8/DOMWrapperWorld.h" |
| 40 #include "bindings/v8/ScriptController.h" | 39 #include "bindings/v8/ScriptController.h" |
| 41 #include "bindings/v8/V8Binding.h" | 40 #include "bindings/v8/V8Binding.h" |
| 42 #include "bindings/v8/V8DOMActivityLogger.h" | 41 #include "bindings/v8/V8DOMActivityLogger.h" |
| 43 #include "bindings/v8/V8GCForContextDispose.h" | 42 #include "bindings/v8/V8GCForContextDispose.h" |
| 44 #include "bindings/v8/V8HiddenValue.h" | 43 #include "bindings/v8/V8HiddenValue.h" |
| 45 #include "bindings/v8/V8Initializer.h" | 44 #include "bindings/v8/V8Initializer.h" |
| 46 #include "bindings/v8/V8ObjectConstructor.h" | 45 #include "bindings/v8/V8ObjectConstructor.h" |
| 47 #include "core/dom/ScriptForbiddenScope.h" | 46 #include "core/dom/ScriptForbiddenScope.h" |
| 48 #include "core/frame/LocalFrame.h" | 47 #include "core/frame/LocalFrame.h" |
| 49 #include "core/frame/csp/ContentSecurityPolicy.h" | 48 #include "core/frame/csp/ContentSecurityPolicy.h" |
| 50 #include "core/html/HTMLCollection.h" | 49 #include "core/html/HTMLCollection.h" |
| 51 #include "core/html/HTMLIFrameElement.h" | 50 #include "core/html/HTMLIFrameElement.h" |
| 52 #include "core/inspector/InspectorInstrumentation.h" | 51 #include "core/inspector/InspectorInstrumentation.h" |
| 53 #include "core/loader/DocumentLoader.h" | 52 #include "core/loader/DocumentLoader.h" |
| 54 #include "core/loader/FrameLoader.h" | 53 #include "core/loader/FrameLoader.h" |
| 55 #include "core/loader/FrameLoaderClient.h" | 54 #include "core/loader/FrameLoaderClient.h" |
| 55 #include "platform/RuntimeEnabledFeatures.h" |
| 56 #include "platform/TraceEvent.h" | 56 #include "platform/TraceEvent.h" |
| 57 #include "platform/heap/Handle.h" | 57 #include "platform/heap/Handle.h" |
| 58 #include "platform/weborigin/SecurityOrigin.h" | 58 #include "platform/weborigin/SecurityOrigin.h" |
| 59 #include "public/platform/Platform.h" | 59 #include "public/platform/Platform.h" |
| 60 #include "wtf/Assertions.h" | 60 #include "wtf/Assertions.h" |
| 61 #include "wtf/OwnPtr.h" | 61 #include "wtf/OwnPtr.h" |
| 62 #include "wtf/StringExtras.h" | 62 #include "wtf/StringExtras.h" |
| 63 #include "wtf/text/CString.h" | 63 #include "wtf/text/CString.h" |
| 64 #include <algorithm> | 64 #include <algorithm> |
| 65 #include <utility> | 65 #include <utility> |
| (...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 | 492 |
| 493 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) | 493 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) |
| 494 { | 494 { |
| 495 ASSERT(m_world->isMainWorld()); | 495 ASSERT(m_world->isMainWorld()); |
| 496 if (!isContextInitialized()) | 496 if (!isContextInitialized()) |
| 497 return; | 497 return; |
| 498 setSecurityToken(origin); | 498 setSecurityToken(origin); |
| 499 } | 499 } |
| 500 | 500 |
| 501 } // WebCore | 501 } // WebCore |
| OLD | NEW |