tor-browser

commit a05a7c50a87838d3d9603511728396f6e900be2b
parent f22505510c37019f14bdeb676b63989e64787469
Author: Matthew Gaudet <mgaudet@mozilla.com>
Date:   Wed, 22 Oct 2025 17:26:19 +0000

Bug 1995630 - Cleanup comments and types in JS MicroTaskQueue r=smaug

The comments in PerformDebuggerMicroTaskCheckpoint are superflous after the landing
of the two mentioned bugs; now both the flow markers and the logging are handled in
RunMicroTask.

Differential Revision: https://phabricator.services.mozilla.com/D269485

Diffstat:
M
xpcom/base/CycleCollectedJSContext.cpp
 | 
34
+++++++++++-----------------------

1 file changed, 11 insertions(+), 23 deletions(-)
diff --git a/xpcom/base/CycleCollectedJSContext.cpp b/xpcom/base/CycleCollectedJSContext.cpp
@@ -976,7 +976,7 @@ SuppressedMicroTaskList::~SuppressedMicroTaskList() {
 
 // Run a microtask. Handles both non-JS (enqueued MicroTaskRunnables) and JS
 // microtasks.
-static bool MOZ_CAN_RUN_SCRIPT
+static void MOZ_CAN_RUN_SCRIPT
 RunMicroTask(JSContext* aCx, JS::MutableHandle<JS::MicroTask> task) {
   if (RefPtr<MicroTaskRunnable> runnable =
           MaybeUnwrapTaskToOwnedRunnable(task)) {
@@ -986,7 +986,7 @@ RunMicroTask(JSContext* aCx, JS::MutableHandle<JS::MicroTask> task) {
         "RunMicroTaskRunnable", OTHER, Flow::FromPointer(runnable.get()));
     AutoSlowOperation aso;
     runnable->Run(aso);
-    return true;
+    return;
   }
 
   MOZ_ASSERT(task.isObject());
@@ -1081,17 +1081,19 @@ RunMicroTask(JSContext* aCx, JS::MutableHandle<JS::MicroTask> task) {
                   "promise callback" /* Some tests care about this string. */,
                   dom::CallbackObject::eReportExceptions);
   if (!setup.GetContext()) {
-    return false;
+    return;
   }
-  bool v = JS::RunJSMicroTask(aCx, task);
+
+  // Note: We're dropping the return value on the floor here, however
+  // cleanup and exception handling are done as part of the CallSetup
+  // destructor if necessary.
+  (void)JS::RunJSMicroTask(aCx, task);
 
   // (The step after step 7): Set event loop’s current scheduling
   // state to null
   if (incumbentGlobal) {
     incumbentGlobal->SetWebTaskSchedulingState(nullptr);
   }
-
-  return v;
 }
 
 static bool IsSuppressed(JS::Handle<JS::MicroTask> task) {
@@ -1217,10 +1219,7 @@ bool CycleCollectedJSContext::PerformMicroTaskCheckPoint(bool aForce) {
         }
         didProcess = true;
 
-        // Note: We're dropping the return value on the floor here, however
-        // cleanup and exception handling are done as part of the CallSetup
-        // destructor if necessary.
-        (void)RunMicroTask(cx, &job);
+        RunMicroTask(cx, &job);
       }
     }
 
@@ -1311,19 +1310,8 @@ void CycleCollectedJSContext::PerformDebuggerMicroTaskCheckpoint() {
       MOZ_ASSERT(mPendingMicroTaskRunnables.empty());
 
       JS::Rooted<JS::MicroTask> job(cx, JS::DequeueNextDebuggerMicroTask(cx));
-      // Bug 1991164: Need to support LogMicroTaskQueueEntry with JS micro
-      // tasks. LogMicroTaskQueueEntry::Run log(job);
-
-      // Bug 1990870: Need to support flows with JS microtasks
-      //   AUTO_PROFILER_TERMINATING_FLOW_MARKER_FLOW_ONLY(
-      // "CycleCollectedJSContext::PerformMicroTaskCheckPoint", OTHER,
-      // Flow::FromPointer(runnable.get()));
-
-      // Note: We're dropping the return value on the floor here. This is
-      // consistent with the previous implementation, which left the exception
-      // if it was there pending on the context, but likely should be
-      // changed.
-      (void)RunMicroTask(cx, &job);
+
+      RunMicroTask(cx, &job);
     }
   } else {
     MOZ_ASSERT(!JS::HasAnyMicroTasks(cx));