| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. | 2 * Copyright (C) 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 * | 24 * |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include "config.h" | 27 #include "config.h" |
| 28 #include "core/dom/ActiveDOMObject.h" | 28 #include "core/dom/ActiveDOMObject.h" |
| 29 | 29 |
| 30 #include "core/dom/ScriptExecutionContext.h" | 30 #include "core/dom/ScriptExecutionContext.h" |
| 31 #include "core/dom/WebCoreMemoryInstrumentation.h" | 31 #include "core/dom/WebCoreMemoryInstrumentation.h" |
| 32 #include "core/workers/WorkerContext.h" | |
| 33 #include "core/workers/WorkerThread.h" | |
| 34 | 32 |
| 35 namespace WebCore { | 33 namespace WebCore { |
| 36 | 34 |
| 37 ActiveDOMObject::ActiveDOMObject(ScriptExecutionContext* scriptExecutionContext) | 35 ActiveDOMObject::ActiveDOMObject(ScriptExecutionContext* scriptExecutionContext) |
| 38 : ContextDestructionObserver(scriptExecutionContext) | 36 : ContextDestructionObserver(scriptExecutionContext) |
| 39 , m_pendingActivityCount(0) | 37 , m_pendingActivityCount(0) |
| 40 #if !ASSERT_DISABLED | 38 #if !ASSERT_DISABLED |
| 41 , m_suspendIfNeededCalled(false) | 39 , m_suspendIfNeededCalled(false) |
| 42 #endif | 40 #endif |
| 43 { | 41 { |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 { | 99 { |
| 102 } | 100 } |
| 103 | 101 |
| 104 void ActiveDOMObject::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) cons
t | 102 void ActiveDOMObject::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) cons
t |
| 105 { | 103 { |
| 106 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); | 104 MemoryClassInfo info(memoryObjectInfo, this, WebCoreMemoryTypes::DOM); |
| 107 } | 105 } |
| 108 | 106 |
| 109 | 107 |
| 110 } // namespace WebCore | 108 } // namespace WebCore |
| OLD | NEW |