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

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

Issue 1818233003: Merge WTF::initializeMainThread into WTF::initialize (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 30 matching lines...) Expand all
41 #include "platform/heap/PagePool.h" 41 #include "platform/heap/PagePool.h"
42 #include "platform/heap/SafePoint.h" 42 #include "platform/heap/SafePoint.h"
43 #include "platform/heap/ThreadState.h" 43 #include "platform/heap/ThreadState.h"
44 #include "public/platform/Platform.h" 44 #include "public/platform/Platform.h"
45 #include "public/platform/WebMemoryAllocatorDump.h" 45 #include "public/platform/WebMemoryAllocatorDump.h"
46 #include "public/platform/WebProcessMemoryDump.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/MainThread.h"
52 #include "wtf/Partitions.h" 51 #include "wtf/Partitions.h"
53 52
54 namespace blink { 53 namespace blink {
55 54
56 HeapAllocHooks::AllocationHook* HeapAllocHooks::m_allocationHook = nullptr; 55 HeapAllocHooks::AllocationHook* HeapAllocHooks::m_allocationHook = nullptr;
57 HeapAllocHooks::FreeHook* HeapAllocHooks::m_freeHook = nullptr; 56 HeapAllocHooks::FreeHook* HeapAllocHooks::m_freeHook = nullptr;
58 57
59 class ParkThreadsScope final { 58 class ParkThreadsScope final {
60 STACK_ALLOCATED(); 59 STACK_ALLOCATED();
61 public: 60 public:
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
665 size_t Heap::s_collectedWrapperCount = 0; 664 size_t Heap::s_collectedWrapperCount = 0;
666 size_t Heap::s_partitionAllocSizeAtLastGC = 0; 665 size_t Heap::s_partitionAllocSizeAtLastGC = 0;
667 double Heap::s_estimatedMarkingTimePerByte = 0.0; 666 double Heap::s_estimatedMarkingTimePerByte = 0.0;
668 bool Heap::s_isLowEndDevice = false; 667 bool Heap::s_isLowEndDevice = false;
669 BlinkGC::GCReason Heap::s_lastGCReason = BlinkGC::NumberOfGCReason; 668 BlinkGC::GCReason Heap::s_lastGCReason = BlinkGC::NumberOfGCReason;
670 #if ENABLE(ASSERT) 669 #if ENABLE(ASSERT)
671 uint16_t Heap::s_gcGeneration = 0; 670 uint16_t Heap::s_gcGeneration = 0;
672 #endif 671 #endif
673 672
674 } // namespace blink 673 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/heap/Handle.h ('k') | third_party/WebKit/Source/platform/heap/HeapPage.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698