1 files changed, 11 insertions, 11 deletions
diff --git a/chromium/third_party/blink/renderer/platform/heap/unified_heap_controller.cc b/chromium/third_party/blink/renderer/platform/heap/unified_heap_controller.cc
index 158d3f8eca5..acb4999607d 100644
--- a/chromium/third_party/blink/renderer/platform/heap/unified_heap_controller.cc
+++ b/chromium/third_party/blink/renderer/platform/heap/unified_heap_controller.cc
@@ -55,9 +55,14 @@ void UnifiedHeapController::EnterFinalPause(EmbedderStackState stack_state) {
       ThreadHeapStatsCollector::kAtomicPhase);
   thread_state_->EnterAtomicPause();
   thread_state_->EnterGCForbiddenScope();
-  thread_state_->AtomicPauseMarkPrologue(ToBlinkGCStackState(stack_state),
-                                         BlinkGC::kIncrementalMarking,
-                                         BlinkGC::GCReason::kUnifiedHeapGC);
+  {
+    ThreadHeapStatsCollector::Scope mark_prologue_scope(
+        thread_state_->Heap().stats_collector(),
+        ThreadHeapStatsCollector::kUnifiedMarkingAtomicPrologue);
+    thread_state_->AtomicPauseMarkPrologue(ToBlinkGCStackState(stack_state),
+                                           BlinkGC::kIncrementalMarking,
+                                           BlinkGC::GCReason::kUnifiedHeapGC);
+  }
 }
 
 void UnifiedHeapController::TraceEpilogue() {
@@ -108,6 +113,9 @@ void UnifiedHeapController::RegisterV8References(
 
 bool UnifiedHeapController::AdvanceTracing(double deadline_in_ms) {
   VLOG(2) << "UnifiedHeapController::AdvanceTracing";
+  ThreadHeapStatsCollector::Scope advance_tracing_scope(
+      thread_state_->Heap().stats_collector(),
+      ThreadHeapStatsCollector::kUnifiedMarkingStep);
 
   if (!thread_state_->in_atomic_pause()) {
     // V8 calls into embedder tracing from its own marking to ensure
@@ -136,14 +144,6 @@ bool UnifiedHeapController::IsRootForNonTracingGCInternal(
       class_id != WrapperTypeInfo::kObjectClassId)
     return true;
 
-  const bool collect_non_node_wrappers =
-      RuntimeEnabledFeatures::HeapCollectLiveNonNodeWrappersEnabled();
-
-  if (!collect_non_node_wrappers &&
-      class_id == WrapperTypeInfo::kObjectClassId) {
-    return true;
-  }
-
   const v8::TracedGlobal<v8::Object>& traced = handle.As<v8::Object>();
   if (ToWrapperTypeInfo(traced)->IsActiveScriptWrappable() &&
       ToScriptWrappable(traced)->HasPendingActivity()) {