Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Side by Side Diff: third_party/WebKit/Source/platform/heap/Heap.cpp

Issue 2015133002: Move memory dumper from public/platform/ to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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"
37 #include "platform/heap/BlinkGCMemoryDumpProvider.h" 39 #include "platform/heap/BlinkGCMemoryDumpProvider.h"
38 #include "platform/heap/CallbackStack.h" 40 #include "platform/heap/CallbackStack.h"
39 #include "platform/heap/MarkingVisitor.h" 41 #include "platform/heap/MarkingVisitor.h"
40 #include "platform/heap/PageMemory.h" 42 #include "platform/heap/PageMemory.h"
41 #include "platform/heap/PagePool.h" 43 #include "platform/heap/PagePool.h"
42 #include "platform/heap/SafePoint.h" 44 #include "platform/heap/SafePoint.h"
43 #include "platform/heap/ThreadState.h" 45 #include "platform/heap/ThreadState.h"
44 #include "public/platform/Platform.h" 46 #include "public/platform/Platform.h"
45 #include "public/platform/WebMemoryAllocatorDump.h"
46 #include "public/platform/WebProcessMemoryDump.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;
56 HeapAllocHooks::FreeHook* HeapAllocHooks::m_freeHook = nullptr; 56 HeapAllocHooks::FreeHook* HeapAllocHooks::m_freeHook = nullptr;
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after
783 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize()); 783 ProcessHeap::decreaseTotalMarkedObjectSize(m_stats.markedObjectSize());
784 784
785 m_stats.reset(); 785 m_stats.reset();
786 for (ThreadState* state : m_threads) 786 for (ThreadState* state : m_threads)
787 state->resetHeapCounters(); 787 state->resetHeapCounters();
788 } 788 }
789 789
790 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr; 790 ThreadHeap* ThreadHeap::s_mainThreadHeap = nullptr;
791 791
792 } // namespace blink 792 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698