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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 #include "bindings/v8/V8ObjectConstructor.h" | 45 #include "bindings/v8/V8ObjectConstructor.h" |
46 #include "bindings/v8/V8PerContextData.h" | 46 #include "bindings/v8/V8PerContextData.h" |
47 #include "core/html/HTMLCollection.h" | 47 #include "core/html/HTMLCollection.h" |
48 #include "core/html/HTMLIFrameElement.h" | 48 #include "core/html/HTMLIFrameElement.h" |
49 #include "core/inspector/InspectorInstrumentation.h" | 49 #include "core/inspector/InspectorInstrumentation.h" |
50 #include "core/loader/DocumentLoader.h" | 50 #include "core/loader/DocumentLoader.h" |
51 #include "core/loader/FrameLoader.h" | 51 #include "core/loader/FrameLoader.h" |
52 #include "core/loader/FrameLoaderClient.h" | 52 #include "core/loader/FrameLoaderClient.h" |
53 #include "core/frame/LocalFrame.h" | 53 #include "core/frame/LocalFrame.h" |
54 #include "core/frame/csp/ContentSecurityPolicy.h" | 54 #include "core/frame/csp/ContentSecurityPolicy.h" |
55 #include "platform/TraceEvent.h" | |
56 #include "platform/weborigin/SecurityOrigin.h" | 55 #include "platform/weborigin/SecurityOrigin.h" |
57 #include "public/platform/Platform.h" | 56 #include "public/platform/Platform.h" |
58 #include "wtf/Assertions.h" | 57 #include "wtf/Assertions.h" |
59 #include "wtf/OwnPtr.h" | 58 #include "wtf/OwnPtr.h" |
60 #include "wtf/StringExtras.h" | 59 #include "wtf/StringExtras.h" |
| 60 #include "wtf/TraceEvent.h" |
61 #include "wtf/text/CString.h" | 61 #include "wtf/text/CString.h" |
62 #include <algorithm> | 62 #include <algorithm> |
63 #include <utility> | 63 #include <utility> |
64 #include <v8-debug.h> | 64 #include <v8-debug.h> |
65 #include <v8.h> | 65 #include <v8.h> |
66 | 66 |
67 namespace WebCore { | 67 namespace WebCore { |
68 | 68 |
69 static void checkDocumentWrapper(v8::Handle<v8::Object> wrapper, Document* docum
ent) | 69 static void checkDocumentWrapper(v8::Handle<v8::Object> wrapper, Document* docum
ent) |
70 { | 70 { |
(...skipping 419 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
490 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) | 490 void V8WindowShell::updateSecurityOrigin(SecurityOrigin* origin) |
491 { | 491 { |
492 ASSERT(m_world->isMainWorld()); | 492 ASSERT(m_world->isMainWorld()); |
493 if (!m_perContextData) | 493 if (!m_perContextData) |
494 return; | 494 return; |
495 v8::HandleScope handleScope(m_isolate); | 495 v8::HandleScope handleScope(m_isolate); |
496 setSecurityToken(origin); | 496 setSecurityToken(origin); |
497 } | 497 } |
498 | 498 |
499 } // WebCore | 499 } // WebCore |
OLD | NEW |