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 11 matching lines...) Expand all Loading... |
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
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 "ScriptExecutionContext.h" | 29 #include "ScriptExecutionContext.h" |
30 | 30 |
31 #include "CachedScript.h" | 31 #include "CachedScript.h" |
32 #include "ContentSecurityPolicy.h" | |
33 #include "DOMTimer.h" | 32 #include "DOMTimer.h" |
34 #include "DatabaseContext.h" | 33 #include "DatabaseContext.h" |
35 #include "ErrorEvent.h" | 34 #include "ErrorEvent.h" |
36 #include "EventListener.h" | |
37 #include "EventTarget.h" | 35 #include "EventTarget.h" |
38 #include "MessagePort.h" | 36 #include "MessagePort.h" |
39 #include "PublicURLManager.h" | 37 #include "PublicURLManager.h" |
| 38 #include "ScriptCallStack.h" |
40 #include "Settings.h" | 39 #include "Settings.h" |
41 #include "WebCoreMemoryInstrumentation.h" | 40 #include "WebCoreMemoryInstrumentation.h" |
42 #include "WorkerContext.h" | 41 #include "WorkerContext.h" |
43 #include "WorkerThread.h" | 42 #include "WorkerThread.h" |
44 #include <wtf/MainThread.h> | 43 #include <wtf/MainThread.h> |
45 #include <wtf/MemoryInstrumentationHashMap.h> | 44 #include <wtf/MemoryInstrumentationHashMap.h> |
46 #include <wtf/MemoryInstrumentationHashSet.h> | |
47 #include <wtf/MemoryInstrumentationVector.h> | 45 #include <wtf/MemoryInstrumentationVector.h> |
48 #include <wtf/PassRefPtr.h> | |
49 #include <wtf/Vector.h> | 46 #include <wtf/Vector.h> |
50 | 47 |
51 namespace WTF { | 48 namespace WTF { |
52 | 49 |
53 template<> struct SequenceMemoryInstrumentationTraits<WebCore::ContextDestructio
nObserver*> { | 50 template<> struct SequenceMemoryInstrumentationTraits<WebCore::ContextDestructio
nObserver*> { |
54 template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&)
{ } | 51 template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&)
{ } |
55 }; | 52 }; |
56 | 53 |
57 } | 54 } |
58 namespace WebCore { | 55 namespace WebCore { |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 { | 390 { |
394 } | 391 } |
395 | 392 |
396 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext
) | 393 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext
) |
397 { | 394 { |
398 ASSERT(!m_databaseContext); | 395 ASSERT(!m_databaseContext); |
399 m_databaseContext = databaseContext; | 396 m_databaseContext = databaseContext; |
400 } | 397 } |
401 | 398 |
402 } // namespace WebCore | 399 } // namespace WebCore |
OLD | NEW |