| Index: third_party/WebKit/Source/wtf/Partitions.h
|
| diff --git a/third_party/WebKit/Source/wtf/Partitions.h b/third_party/WebKit/Source/wtf/Partitions.h
|
| index 194003948a6d8e64a5835d4e96486857bffad164..bdb7797133b7d7adcb0d8d332296c2e58ffb922b 100644
|
| --- a/third_party/WebKit/Source/wtf/Partitions.h
|
| +++ b/third_party/WebKit/Source/wtf/Partitions.h
|
| @@ -62,13 +62,8 @@ public:
|
|
|
| ALWAYS_INLINE static PartitionRoot* nodePartition()
|
| {
|
| -#if ENABLE(OILPAN)
|
| ASSERT_NOT_REACHED();
|
| return nullptr;
|
| -#else
|
| - ASSERT(s_initialized);
|
| - return m_nodeAllocator.root();
|
| -#endif
|
| }
|
| ALWAYS_INLINE static PartitionRoot* layoutPartition()
|
| {
|
| @@ -79,12 +74,8 @@ public:
|
| static size_t currentDOMMemoryUsage()
|
| {
|
| ASSERT(s_initialized);
|
| -#if ENABLE(OILPAN)
|
| ASSERT_NOT_REACHED();
|
| return 0;
|
| -#else
|
| - return m_nodeAllocator.root()->totalSizeOfCommittedPages;
|
| -#endif
|
| }
|
|
|
| static size_t totalSizeOfCommittedPages()
|
| @@ -92,9 +83,6 @@ public:
|
| size_t totalSize = 0;
|
| totalSize += m_fastMallocAllocator.root()->totalSizeOfCommittedPages;
|
| totalSize += m_bufferAllocator.root()->totalSizeOfCommittedPages;
|
| -#if !ENABLE(OILPAN)
|
| - totalSize += m_nodeAllocator.root()->totalSizeOfCommittedPages;
|
| -#endif
|
| totalSize += m_layoutAllocator.root()->totalSizeOfCommittedPages;
|
| return totalSize;
|
| }
|
| @@ -158,9 +146,6 @@ private:
|
| // - Fast malloc partition: A partition to allocate all other objects.
|
| static PartitionAllocatorGeneric m_fastMallocAllocator;
|
| static PartitionAllocatorGeneric m_bufferAllocator;
|
| -#if !ENABLE(OILPAN)
|
| - static SizeSpecificPartitionAllocator<3328> m_nodeAllocator;
|
| -#endif
|
| static SizeSpecificPartitionAllocator<1024> m_layoutAllocator;
|
| static ReportPartitionAllocSizeFunction m_reportSizeFunction;
|
| };
|
|
|