| 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 18 matching lines...) Expand all Loading... |
| 29 #include "core/dom/ScriptExecutionContext.h" | 29 #include "core/dom/ScriptExecutionContext.h" |
| 30 | 30 |
| 31 #include "core/dom/ErrorEvent.h" | 31 #include "core/dom/ErrorEvent.h" |
| 32 #include "core/dom/EventTarget.h" | 32 #include "core/dom/EventTarget.h" |
| 33 #include "core/dom/MessagePort.h" | 33 #include "core/dom/MessagePort.h" |
| 34 #include "core/dom/WebCoreMemoryInstrumentation.h" | 34 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 35 #include "core/html/PublicURLManager.h" | 35 #include "core/html/PublicURLManager.h" |
| 36 #include "core/inspector/ScriptCallStack.h" | 36 #include "core/inspector/ScriptCallStack.h" |
| 37 #include "core/loader/cache/CachedScript.h" | 37 #include "core/loader/cache/CachedScript.h" |
| 38 #include "core/page/DOMTimer.h" | 38 #include "core/page/DOMTimer.h" |
| 39 #include "core/workers/WorkerContext.h" | |
| 40 #include "core/workers/WorkerThread.h" | |
| 41 #include "modules/webdatabase/DatabaseContext.h" | 39 #include "modules/webdatabase/DatabaseContext.h" |
| 42 #include <wtf/MainThread.h> | 40 #include <wtf/MainThread.h> |
| 43 #include <wtf/MemoryInstrumentationHashMap.h> | 41 #include <wtf/MemoryInstrumentationHashMap.h> |
| 44 #include <wtf/MemoryInstrumentationVector.h> | 42 #include <wtf/MemoryInstrumentationVector.h> |
| 45 | 43 |
| 46 namespace WTF { | 44 namespace WTF { |
| 47 | 45 |
| 48 template<> struct SequenceMemoryInstrumentationTraits<WebCore::ContextDestructio
nObserver*> { | 46 template<> struct SequenceMemoryInstrumentationTraits<WebCore::ContextDestructio
nObserver*> { |
| 49 template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&)
{ } | 47 template <typename I> static void reportMemoryUsage(I, I, MemoryClassInfo&)
{ } |
| 50 }; | 48 }; |
| (...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 368 { | 366 { |
| 369 } | 367 } |
| 370 | 368 |
| 371 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext
) | 369 void ScriptExecutionContext::setDatabaseContext(DatabaseContext* databaseContext
) |
| 372 { | 370 { |
| 373 ASSERT(!m_databaseContext); | 371 ASSERT(!m_databaseContext); |
| 374 m_databaseContext = databaseContext; | 372 m_databaseContext = databaseContext; |
| 375 } | 373 } |
| 376 | 374 |
| 377 } // namespace WebCore | 375 } // namespace WebCore |
| OLD | NEW |