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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/ContentSecurityPolicy.h" | 53 #include "core/frame/ContentSecurityPolicy.h" |
54 #include "core/frame/Frame.h" | 54 #include "core/frame/Frame.h" |
55 #include "core/page/Page.h" | 55 #include "core/page/Page.h" |
56 #include "platform/TraceEvent.h" | 56 #include "platform/TraceEvent.h" |
| 57 #include "platform/weborigin/SecurityOrigin.h" |
57 #include "public/platform/Platform.h" | 58 #include "public/platform/Platform.h" |
58 #include "weborigin/SecurityOrigin.h" | |
59 #include "wtf/Assertions.h" | 59 #include "wtf/Assertions.h" |
60 #include "wtf/OwnPtr.h" | 60 #include "wtf/OwnPtr.h" |
61 #include "wtf/StringExtras.h" | 61 #include "wtf/StringExtras.h" |
62 #include "wtf/text/CString.h" | 62 #include "wtf/text/CString.h" |
63 #include <algorithm> | 63 #include <algorithm> |
64 #include <utility> | 64 #include <utility> |
65 #include <v8-debug.h> | 65 #include <v8-debug.h> |
66 #include <v8.h> | 66 #include <v8.h> |
67 | 67 |
68 namespace WebCore { | 68 namespace WebCore { |
(...skipping 425 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
494 void V8WindowShell::updateSecurityOrigin() | 494 void V8WindowShell::updateSecurityOrigin() |
495 { | 495 { |
496 ASSERT(m_world->isMainWorld()); | 496 ASSERT(m_world->isMainWorld()); |
497 if (m_context.isEmpty()) | 497 if (m_context.isEmpty()) |
498 return; | 498 return; |
499 v8::HandleScope handleScope(m_isolate); | 499 v8::HandleScope handleScope(m_isolate); |
500 setSecurityToken(); | 500 setSecurityToken(); |
501 } | 501 } |
502 | 502 |
503 } // WebCore | 503 } // WebCore |
OLD | NEW |