| Index: Source/wtf/Partitions.cpp
|
| diff --git a/Source/wtf/Partitions.cpp b/Source/wtf/Partitions.cpp
|
| index a9b828dd22f3f91808fe1403b41c2a9a3c398f19..c8f6e7500d803eea15b326e87bbd67075f7f1111 100644
|
| --- a/Source/wtf/Partitions.cpp
|
| +++ b/Source/wtf/Partitions.cpp
|
| @@ -42,7 +42,7 @@ bool Partitions::s_initialized;
|
| PartitionAllocatorGeneric Partitions::m_fastMallocAllocator;
|
| PartitionAllocatorGeneric Partitions::m_bufferAllocator;
|
| SizeSpecificPartitionAllocator<3328> Partitions::m_objectModelAllocator;
|
| -SizeSpecificPartitionAllocator<1024> Partitions::m_renderingAllocator;
|
| +SizeSpecificPartitionAllocator<1024> Partitions::m_layoutAllocator;
|
| HistogramEnumerationFunction Partitions::m_histogramEnumeration = nullptr;
|
|
|
| void Partitions::initialize(HistogramEnumerationFunction histogramEnumeration)
|
| @@ -54,7 +54,7 @@ void Partitions::initialize(HistogramEnumerationFunction histogramEnumeration)
|
| m_fastMallocAllocator.init();
|
| m_bufferAllocator.init();
|
| m_objectModelAllocator.init();
|
| - m_renderingAllocator.init();
|
| + m_layoutAllocator.init();
|
| m_histogramEnumeration = histogramEnumeration;
|
| s_initialized = true;
|
| }
|
| @@ -66,7 +66,7 @@ void Partitions::shutdown()
|
| // We could ASSERT here for a memory leak within the partition, but it leads
|
| // to very hard to diagnose ASSERTs, so it's best to leave leak checking for
|
| // the valgrind and heapcheck bots, which run without partitions.
|
| - (void) m_renderingAllocator.shutdown();
|
| + (void) m_layoutAllocator.shutdown();
|
| (void) m_objectModelAllocator.shutdown();
|
| (void) m_bufferAllocator.shutdown();
|
| (void) m_fastMallocAllocator.shutdown();
|
| @@ -76,10 +76,10 @@ void Partitions::decommitFreeableMemory()
|
| {
|
| ASSERT(isMainThread());
|
|
|
| - partitionPurgeMemoryGeneric(getBufferPartition());
|
| - partitionPurgeMemoryGeneric(getFastMallocPartition());
|
| - partitionPurgeMemory(getObjectModelPartition());
|
| - partitionPurgeMemory(getRenderingPartition());
|
| + partitionPurgeMemoryGeneric(bufferPartition());
|
| + partitionPurgeMemoryGeneric(fastMallocPartition());
|
| + partitionPurgeMemory(objectModelPartition());
|
| + partitionPurgeMemory(layoutPartition());
|
| }
|
|
|
| void Partitions::reportMemoryUsageHistogram()
|
| @@ -110,10 +110,10 @@ void Partitions::dumpMemoryStats(PartitionStatsDumper* partitionStatsDumper)
|
| // accessed only on the main thread.
|
| ASSERT(isMainThread());
|
|
|
| - partitionDumpStatsGeneric(getFastMallocPartition(), "fast_malloc_partition", partitionStatsDumper);
|
| - partitionDumpStatsGeneric(getBufferPartition(), "buffer_partition", partitionStatsDumper);
|
| - partitionDumpStats(getObjectModelPartition(), "object_model_partition", partitionStatsDumper);
|
| - partitionDumpStats(getRenderingPartition(), "rendering_partition", partitionStatsDumper);
|
| + partitionDumpStatsGeneric(fastMallocPartition(), "fast_malloc_partition", partitionStatsDumper);
|
| + partitionDumpStatsGeneric(bufferPartition(), "buffer_partition", partitionStatsDumper);
|
| + partitionDumpStats(objectModelPartition(), "object_model_partition", partitionStatsDumper);
|
| + partitionDumpStats(layoutPartition(), "layout_partition", partitionStatsDumper);
|
| }
|
|
|
| } // namespace WTF
|
|
|