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

Unified Diff: Source/platform/heap/Heap.cpp

Issue 730443002: Oilpan: We shouldn't calculate allocationSizeFromSize twice (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/heap/Heap.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/heap/Heap.cpp
diff --git a/Source/platform/heap/Heap.cpp b/Source/platform/heap/Heap.cpp
index d775343e9681faf8f23c2f66261482d130fad816..628dc4d9a5330063c29d7af0ec4c8a0a82929b22 100644
--- a/Source/platform/heap/Heap.cpp
+++ b/Source/platform/heap/Heap.cpp
@@ -701,9 +701,8 @@ void ThreadHeap<Header>::updateRemainingAllocationSize()
}
template<typename Header>
-Address ThreadHeap<Header>::outOfLineAllocate(size_t size, const GCInfo* gcInfo)
+Address ThreadHeap<Header>::outOfLineAllocate(size_t payloadSize, size_t allocationSize, const GCInfo* gcInfo)
{
- size_t allocationSize = allocationSizeFromSize(size);
ASSERT(allocationSize > remainingAllocationSize());
if (allocationSize > blinkPageSize / 2)
return allocateLargeObject(allocationSize, gcInfo);
@@ -720,7 +719,7 @@ Address ThreadHeap<Header>::outOfLineAllocate(size_t size, const GCInfo* gcInfo)
setAllocationPoint(0, 0);
}
ensureCurrentAllocation(allocationSize, gcInfo);
- return allocate(size, gcInfo);
+ return allocate(payloadSize, gcInfo);
}
template<typename Header>
« no previous file with comments | « Source/platform/heap/Heap.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698