From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/v8/src/heap/cppgc/allocation.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'chromium/v8/src/heap/cppgc/allocation.cc') diff --git a/chromium/v8/src/heap/cppgc/allocation.cc b/chromium/v8/src/heap/cppgc/allocation.cc index 32f917da5ac..04bcea82d03 100644 --- a/chromium/v8/src/heap/cppgc/allocation.cc +++ b/chromium/v8/src/heap/cppgc/allocation.cc @@ -6,7 +6,7 @@ #include "src/base/logging.h" #include "src/base/macros.h" -#include "src/heap/cppgc/heap-inl.h" +#include "src/heap/cppgc/object-allocator-inl.h" namespace cppgc { namespace internal { @@ -15,19 +15,17 @@ STATIC_ASSERT(api_constants::kLargeObjectSizeThreshold == kLargeObjectSizeThreshold); // static -void* MakeGarbageCollectedTraitInternal::Allocate(cppgc::Heap* heap, - size_t size, - GCInfoIndex index) { - DCHECK_NOT_NULL(heap); - return Heap::From(heap)->Allocate(size, index); +void* MakeGarbageCollectedTraitInternal::Allocate( + cppgc::AllocationHandle& handle, size_t size, GCInfoIndex index) { + return static_cast(handle).AllocateObject(size, index); } // static void* MakeGarbageCollectedTraitInternal::Allocate( - cppgc::Heap* heap, size_t size, GCInfoIndex index, + cppgc::AllocationHandle& handle, size_t size, GCInfoIndex index, CustomSpaceIndex space_index) { - DCHECK_NOT_NULL(heap); - return Heap::From(heap)->Allocate(size, index, space_index); + return static_cast(handle).AllocateObject(size, index, + space_index); } } // namespace internal -- cgit v1.2.1