Index: third_party/WebKit/Source/platform/heap/HeapPage.cpp |
diff --git a/third_party/WebKit/Source/platform/heap/HeapPage.cpp b/third_party/WebKit/Source/platform/heap/HeapPage.cpp |
index 1ccefe06684504e2da4a69d070bf6ccce9b1da4e..d30adf64f447bac87e1cd1b87c1e24822f02e212 100644 |
--- a/third_party/WebKit/Source/platform/heap/HeapPage.cpp |
+++ b/third_party/WebKit/Source/platform/heap/HeapPage.cpp |
@@ -136,9 +136,9 @@ void BaseArena::takeSnapshot(const String& dumpBaseName, |
size_t pageCount = 0; |
BasePage::HeapSnapshotInfo heapInfo; |
for (BasePage* page = m_firstUnsweptPage; page; page = page->next()) { |
- String dumpName = |
- dumpBaseName + String::format("/pages/page_%lu", |
- static_cast<unsigned long>(pageCount++)); |
+ String dumpName = dumpBaseName + |
+ String::format("/pages/page_%lu", |
+ static_cast<unsigned long>(pageCount++)); |
base::trace_event::MemoryAllocatorDump* pageDump = |
BlinkGCMemoryDumpProvider::instance() |
->createMemoryAllocatorDumpForCurrentGC(dumpName); |
@@ -699,9 +699,9 @@ bool NormalPageArena::coalesce() { |
// invariant that memory on the free list is zero filled. |
// The rest of the memory is already on the free list and is |
// therefore already zero filled. |
- SET_MEMORY_INACCESSIBLE(headerAddress, size < sizeof(FreeListEntry) |
- ? size |
- : sizeof(FreeListEntry)); |
+ SET_MEMORY_INACCESSIBLE( |
+ headerAddress, |
+ size < sizeof(FreeListEntry) ? size : sizeof(FreeListEntry)); |
CHECK_MEMORY_INACCESSIBLE(headerAddress, size); |
headerAddress += size; |
continue; |
@@ -1217,9 +1217,9 @@ bool FreeList::takeSnapshot(const String& dumpBaseName) { |
freeSize += entry->size(); |
} |
- String dumpName = |
- dumpBaseName + String::format("/buckets/bucket_%lu", |
- static_cast<unsigned long>(1 << i)); |
+ String dumpName = dumpBaseName + |
+ String::format("/buckets/bucket_%lu", |
+ static_cast<unsigned long>(1 << i)); |
base::trace_event::MemoryAllocatorDump* bucketDump = |
BlinkGCMemoryDumpProvider::instance() |
->createMemoryAllocatorDumpForCurrentGC(dumpName); |
@@ -1298,9 +1298,9 @@ void NormalPage::sweep() { |
// invariant that memory on the free list is zero filled. |
// The rest of the memory is already on the free list and is |
// therefore already zero filled. |
- SET_MEMORY_INACCESSIBLE(headerAddress, size < sizeof(FreeListEntry) |
- ? size |
- : sizeof(FreeListEntry)); |
+ SET_MEMORY_INACCESSIBLE( |
+ headerAddress, |
+ size < sizeof(FreeListEntry) ? size : sizeof(FreeListEntry)); |
CHECK_MEMORY_INACCESSIBLE(headerAddress, size); |
headerAddress += size; |
continue; |
@@ -1470,9 +1470,9 @@ void NormalPage::makeConsistentForMutator() { |
// invariant that memory on the free list is zero filled. |
// The rest of the memory is already on the free list and is |
// therefore already zero filled. |
- SET_MEMORY_INACCESSIBLE(headerAddress, size < sizeof(FreeListEntry) |
- ? size |
- : sizeof(FreeListEntry)); |
+ SET_MEMORY_INACCESSIBLE( |
+ headerAddress, |
+ size < sizeof(FreeListEntry) ? size : sizeof(FreeListEntry)); |
CHECK_MEMORY_INACCESSIBLE(headerAddress, size); |
headerAddress += size; |
continue; |