| Index: third_party/WebKit/Source/wtf/allocator/Partitions.h
|
| diff --git a/third_party/WebKit/Source/wtf/allocator/Partitions.h b/third_party/WebKit/Source/wtf/allocator/Partitions.h
|
| index 6bb530d754bf7b7874c0f7d0aa17446fb07fdd34..3f246be67081046ff84ff7b48d8c0397a98c35dc 100644
|
| --- a/third_party/WebKit/Source/wtf/allocator/Partitions.h
|
| +++ b/third_party/WebKit/Source/wtf/allocator/Partitions.h
|
| @@ -76,9 +76,9 @@ class WTF_EXPORT Partitions {
|
|
|
| static size_t totalSizeOfCommittedPages() {
|
| size_t totalSize = 0;
|
| - totalSize += m_fastMallocAllocator.root()->totalSizeOfCommittedPages;
|
| - totalSize += m_bufferAllocator.root()->totalSizeOfCommittedPages;
|
| - totalSize += m_layoutAllocator.root()->totalSizeOfCommittedPages;
|
| + totalSize += m_fastMallocAllocator.root()->total_size_of_committed_pages;
|
| + totalSize += m_bufferAllocator.root()->total_size_of_committed_pages;
|
| + totalSize += m_layoutAllocator.root()->total_size_of_committed_pages;
|
| return totalSize;
|
| }
|
|
|
| @@ -89,21 +89,21 @@ class WTF_EXPORT Partitions {
|
| static void dumpMemoryStats(bool isLightDump, base::PartitionStatsDumper*);
|
|
|
| ALWAYS_INLINE static void* bufferMalloc(size_t n, const char* typeName) {
|
| - return partitionAllocGeneric(bufferPartition(), n, typeName);
|
| + return PartitionAllocGeneric(bufferPartition(), n, typeName);
|
| }
|
| ALWAYS_INLINE static void* bufferRealloc(void* p,
|
| size_t n,
|
| const char* typeName) {
|
| - return partitionReallocGeneric(bufferPartition(), p, n, typeName);
|
| + return PartitionReallocGeneric(bufferPartition(), p, n, typeName);
|
| }
|
| ALWAYS_INLINE static void bufferFree(void* p) {
|
| - partitionFreeGeneric(bufferPartition(), p);
|
| + PartitionFreeGeneric(bufferPartition(), p);
|
| }
|
| ALWAYS_INLINE static size_t bufferActualSize(size_t n) {
|
| - return partitionAllocActualSize(bufferPartition(), n);
|
| + return PartitionAllocActualSize(bufferPartition(), n);
|
| }
|
| static void* fastMalloc(size_t n, const char* typeName) {
|
| - return partitionAllocGeneric(Partitions::fastMallocPartition(), n,
|
| + return PartitionAllocGeneric(Partitions::fastMallocPartition(), n,
|
| typeName);
|
| }
|
| static void* fastZeroedMalloc(size_t n, const char* typeName) {
|
| @@ -112,11 +112,11 @@ class WTF_EXPORT Partitions {
|
| return result;
|
| }
|
| static void* fastRealloc(void* p, size_t n, const char* typeName) {
|
| - return partitionReallocGeneric(Partitions::fastMallocPartition(), p, n,
|
| + return PartitionReallocGeneric(Partitions::fastMallocPartition(), p, n,
|
| typeName);
|
| }
|
| static void fastFree(void* p) {
|
| - partitionFreeGeneric(Partitions::fastMallocPartition(), p);
|
| + PartitionFreeGeneric(Partitions::fastMallocPartition(), p);
|
| }
|
|
|
| static void handleOutOfMemory();
|
| @@ -149,17 +149,17 @@ using base::kPageAllocationGranularityBaseMask;
|
| using base::kPageAllocationGranularityOffsetMask;
|
| using base::kSystemPageSize;
|
|
|
| -using base::allocPages;
|
| -using base::decommitSystemPages;
|
| -using base::discardSystemPages;
|
| -using base::partitionFree;
|
| -using base::freePages;
|
| -using base::getAllocPageErrorCode;
|
| -using base::recommitSystemPages;
|
| -using base::roundDownToSystemPage;
|
| -using base::roundUpToSystemPage;
|
| -using base::setSystemPagesAccessible;
|
| -using base::setSystemPagesInaccessible;
|
| +using base::AllocPages;
|
| +using base::DecommitSystemPages;
|
| +using base::DiscardSystemPages;
|
| +using base::PartitionFree;
|
| +using base::FreePages;
|
| +using base::GetAllocPageErrorCode;
|
| +using base::RecommitSystemPages;
|
| +using base::RoundDownToSystemPage;
|
| +using base::RoundUpToSystemPage;
|
| +using base::SetSystemPagesAccessible;
|
| +using base::SetSystemPagesInaccessible;
|
|
|
| using base::PageAccessible;
|
| using base::PageInaccessible;
|
|
|