OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 16 matching lines...) Expand all Loading... |
27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
29 */ | 29 */ |
30 | 30 |
31 #include "platform/heap/Heap.h" | 31 #include "platform/heap/Heap.h" |
32 | 32 |
33 #include "base/sys_info.h" | 33 #include "base/sys_info.h" |
34 #include "platform/Histogram.h" | 34 #include "platform/Histogram.h" |
35 #include "platform/ScriptForbiddenScope.h" | 35 #include "platform/ScriptForbiddenScope.h" |
36 #include "platform/TraceEvent.h" | 36 #include "platform/TraceEvent.h" |
37 #include "platform/WebMemoryAllocatorDump.h" | |
38 #include "platform/WebProcessMemoryDump.h" | |
39 #include "platform/heap/BlinkGCMemoryDumpProvider.h" | 37 #include "platform/heap/BlinkGCMemoryDumpProvider.h" |
40 #include "platform/heap/CallbackStack.h" | 38 #include "platform/heap/CallbackStack.h" |
41 #include "platform/heap/MarkingVisitor.h" | 39 #include "platform/heap/MarkingVisitor.h" |
42 #include "platform/heap/PageMemory.h" | 40 #include "platform/heap/PageMemory.h" |
43 #include "platform/heap/PagePool.h" | 41 #include "platform/heap/PagePool.h" |
44 #include "platform/heap/SafePoint.h" | 42 #include "platform/heap/SafePoint.h" |
45 #include "platform/heap/ThreadState.h" | 43 #include "platform/heap/ThreadState.h" |
| 44 #include "platform/web_memory_allocator_dump.h" |
| 45 #include "platform/web_process_memory_dump.h" |
46 #include "public/platform/Platform.h" | 46 #include "public/platform/Platform.h" |
47 #include "wtf/Assertions.h" | 47 #include "wtf/Assertions.h" |
48 #include "wtf/CurrentTime.h" | 48 #include "wtf/CurrentTime.h" |
49 #include "wtf/DataLog.h" | 49 #include "wtf/DataLog.h" |
50 #include "wtf/LeakAnnotations.h" | 50 #include "wtf/LeakAnnotations.h" |
51 #include "wtf/allocator/Partitions.h" | 51 #include "wtf/allocator/Partitions.h" |
52 | 52 |
53 namespace blink { | 53 namespace blink { |
54 | 54 |
55 HeapAllocHooks::AllocationHook* HeapAllocHooks::m_allocationHook = nullptr; | 55 HeapAllocHooks::AllocationHook* HeapAllocHooks::m_allocationHook = nullptr; |
(...skipping 737 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
793 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); | 793 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); |
794 | 794 |
795 m_stats.reset(); | 795 m_stats.reset(); |
796 for (ThreadState* state : m_threads) | 796 for (ThreadState* state : m_threads) |
797 state->resetHeapCounters(); | 797 state->resetHeapCounters(); |
798 } | 798 } |
799 | 799 |
800 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; | 800 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; |
801 | 801 |
802 } // namespace blink | 802 } // namespace blink |
OLD | NEW |