OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. |
3 * Copyright (C) 2012 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2012 Google Inc. All Rights Reserved. |
4 * | 4 * |
5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
7 * are met: | 7 * are met: |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 13 matching lines...) Expand all Loading... |
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
25 * | 25 * |
26 */ | 26 */ |
27 | 27 |
28 #include "config.h" | 28 #include "config.h" |
29 #include "core/dom/ExecutionContext.h" | 29 #include "core/dom/ExecutionContext.h" |
30 | 30 |
31 #include "core/dom/AddConsoleMessageTask.h" | 31 #include "core/dom/AddConsoleMessageTask.h" |
32 #include "core/dom/ContextLifecycleNotifier.h" | 32 #include "core/dom/ContextLifecycleNotifier.h" |
33 #include "core/dom/ExecutionContextTask.h" | 33 #include "core/dom/ExecutionContextTask.h" |
34 #include "core/events/ErrorEvent.h" | |
35 #include "core/events/EventTarget.h" | 34 #include "core/events/EventTarget.h" |
36 #include "core/frame/DOMTimer.h" | |
37 #include "core/html/PublicURLManager.h" | 35 #include "core/html/PublicURLManager.h" |
38 #include "core/inspector/InspectorInstrumentation.h" | 36 #include "core/inspector/InspectorInstrumentation.h" |
39 #include "core/inspector/ScriptCallStack.h" | 37 #include "core/inspector/ScriptCallStack.h" |
40 #include "core/workers/WorkerGlobalScope.h" | 38 #include "core/workers/WorkerGlobalScope.h" |
41 #include "core/workers/WorkerThread.h" | 39 #include "core/workers/WorkerThread.h" |
42 #include "wtf/MainThread.h" | 40 #include "wtf/MainThread.h" |
43 | 41 |
44 namespace WebCore { | 42 namespace WebCore { |
45 | 43 |
46 class ExecutionContext::PendingException { | 44 class ExecutionContext::PendingException { |
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
330 | 328 |
331 RELEASE_ASSERT(m_client); | 329 RELEASE_ASSERT(m_client); |
332 // The SandboxOrigin is stored redundantly in the security origin. | 330 // The SandboxOrigin is stored redundantly in the security origin. |
333 if (isSandboxed(SandboxOrigin) && m_client->securityContext().securityOrigin
() && !m_client->securityContext().securityOrigin()->isUnique()) { | 331 if (isSandboxed(SandboxOrigin) && m_client->securityContext().securityOrigin
() && !m_client->securityContext().securityOrigin()->isUnique()) { |
334 m_client->securityContext().setSecurityOrigin(SecurityOrigin::createUniq
ue()); | 332 m_client->securityContext().setSecurityOrigin(SecurityOrigin::createUniq
ue()); |
335 m_client->didUpdateSecurityOrigin(); | 333 m_client->didUpdateSecurityOrigin(); |
336 } | 334 } |
337 } | 335 } |
338 | 336 |
339 } // namespace WebCore | 337 } // namespace WebCore |
OLD | NEW |