diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/v8/src/heap/cppgc/prefinalizer-handler.cc | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/v8/src/heap/cppgc/prefinalizer-handler.cc')
| -rw-r--r-- | chromium/v8/src/heap/cppgc/prefinalizer-handler.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/chromium/v8/src/heap/cppgc/prefinalizer-handler.cc b/chromium/v8/src/heap/cppgc/prefinalizer-handler.cc index 40107c15262..c28cedfbab9 100644 --- a/chromium/v8/src/heap/cppgc/prefinalizer-handler.cc +++ b/chromium/v8/src/heap/cppgc/prefinalizer-handler.cc @@ -8,6 +8,7 @@ #include <memory> #include "src/base/platform/platform.h" +#include "src/heap/cppgc/heap-page-inl.h" #include "src/heap/cppgc/heap.h" namespace cppgc { @@ -15,14 +16,16 @@ namespace internal { // static void PreFinalizerRegistrationDispatcher::RegisterPrefinalizer( - cppgc::Heap* heap, PreFinalizer prefinalzier) { - internal::Heap::From(heap)->prefinalizer_handler()->RegisterPrefinalizer( - prefinalzier); + PreFinalizer pre_finalizer) { + BasePage::FromPayload(pre_finalizer.object) + ->heap() + ->prefinalizer_handler() + ->RegisterPrefinalizer(pre_finalizer); } bool PreFinalizerRegistrationDispatcher::PreFinalizer::operator==( const PreFinalizer& other) { - return (object_ == other.object_) && (callback_ == other.callback_); + return (object == other.object) && (callback == other.callback); } PreFinalizerHandler::PreFinalizerHandler() @@ -32,12 +35,12 @@ PreFinalizerHandler::PreFinalizerHandler() { } -void PreFinalizerHandler::RegisterPrefinalizer(PreFinalizer prefinalizer) { +void PreFinalizerHandler::RegisterPrefinalizer(PreFinalizer pre_finalizer) { DCHECK(CurrentThreadIsCreationThread()); DCHECK_EQ(ordered_pre_finalizers_.end(), std::find(ordered_pre_finalizers_.begin(), - ordered_pre_finalizers_.end(), prefinalizer)); - ordered_pre_finalizers_.push_back(prefinalizer); + ordered_pre_finalizers_.end(), pre_finalizer)); + ordered_pre_finalizers_.push_back(pre_finalizer); } void PreFinalizerHandler::InvokePreFinalizers() { @@ -48,7 +51,7 @@ void PreFinalizerHandler::InvokePreFinalizers() { std::remove_if(ordered_pre_finalizers_.rbegin(), ordered_pre_finalizers_.rend(), [liveness_broker](const PreFinalizer& pf) { - return (pf.callback_)(liveness_broker, pf.object_); + return (pf.callback)(liveness_broker, pf.object); }) .base()); ordered_pre_finalizers_.shrink_to_fit(); |