From 38a22ee2483d4fe43a10dbf99b848b7bcc423f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Naz=C4=B1m=20Can=20Alt=C4=B1nova?= <canaltinova@gmail.com>
Date: Wed, 15 Feb 2023 15:53:28 +0000
Subject: [PATCH] Bug 1814908 - Remove the custom handling for the File IO
 markers r=julienw

Differential Revision: https://phabricator.services.mozilla.com/D169113
---
 tools/profiler/gecko/ProfilerIOInterposeObserver.cpp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp b/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
index 00577209131a..cf33789f69d8 100644
--- a/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
+++ b/tools/profiler/gecko/ProfilerIOInterposeObserver.cpp
@@ -91,7 +91,6 @@ void ProfilerIOInterposeObserver::Observe(Observation& aObservation) {
   }
 
   AUTO_PROFILER_LABEL("ProfilerIOInterposeObserver", PROFILER);
-  const bool doCaptureStack = !(features & ProfilerFeature::NoMarkerStacks);
   if (IsMainThread()) {
     // This is the main thread.
     // Capture a marker if any "IO" feature is on.
@@ -109,7 +108,7 @@ void ProfilerIOInterposeObserver::Observe(Observation& aObservation) {
         type, OTHER,
         MarkerOptions(
             MarkerTiming::Interval(aObservation.Start(), aObservation.End()),
-            MarkerStack::MaybeCapture(doCaptureStack)),
+            MarkerStack::Capture()),
         FileIOMarker,
         // aOperation
         ProfilerString8View::WrapNullTerminatedString(
@@ -135,8 +134,7 @@ void ProfilerIOInterposeObserver::Observe(Observation& aObservation) {
 
     // Share a backtrace between the marker on this thread, and the marker on
     // the main thread.
-    UniquePtr<ProfileChunkedBuffer> backtrace =
-        doCaptureStack ? profiler_capture_backtrace() : nullptr;
+    UniquePtr<ProfileChunkedBuffer> backtrace = profiler_capture_backtrace();
 
     // Store the marker in the current thread.
     PROFILER_MARKER(
@@ -201,7 +199,7 @@ void ProfilerIOInterposeObserver::Observe(Observation& aObservation) {
         type, OTHER,
         MarkerOptions(
             MarkerTiming::Interval(aObservation.Start(), aObservation.End()),
-            doCaptureStack ? MarkerStack::Capture() : MarkerStack::NoStack(),
+            MarkerStack::Capture(),
             // Store this marker on the main thread.
             MarkerThreadId::MainThread()),
         FileIOMarker,