heap: Unregister cancelable task immediately after execution

Theoretically, if the scheduler for some reason doesn't destroy the
callback right after its execution,
CancelableTaskScheduler::CancelAndWait may stall. I'm not sure if this
is the reason why performance tests fail with timeouts on win-perf, but
it may be related to Windows scheduler specifics.

Bug: 987574
Change-Id: Id3bf951c78bf37aae66ce0657e113ddefe9918b1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1731930
Commit-Queue: Anton Bikineev <bikineev@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#683514}

third_party/blink/renderer/platform/heap/cancelable_task_scheduler.cc

@@ -22,10 +22,8 @@ class CancelableTaskScheduler::TaskData {
 
   ~TaskData() {
     // The task runner is responsible for unregistering the task in case the
-    // task hasn't been cancelled. The first check returns true if the task
-    // hasn't been executed, the second returns true if it has.
-    Status previous;
-    if (TryRun(&previous) || previous == kRunning) {
+    // task hasn't been cancelled.
+    if (TryCancel()) {
       scheduler_->UnregisterAndSignal(this);
     }
   }
@@ -33,6 +31,7 @@ class CancelableTaskScheduler::TaskData {
   void Run() {
     if (TryRun()) {
       std::move(task_).Run();
+      scheduler_->UnregisterAndSignal(this);
     }
   }
 
@@ -51,17 +50,11 @@ class CancelableTaskScheduler::TaskData {
   // |kRunning|: The task is currently running and cannot be canceled anymore.
   enum Status : uint8_t { kWaiting, kCancelled, kRunning };
 
-  friend size_t RemoveCancelledTasks(WTF::HashSet<TaskData*>*);
-
-  bool TryRun(Status* previous = nullptr) {
+  bool TryRun() {
     Status expected = kWaiting;
-    const bool success = status_.compare_exchange_strong(
-        expected, kRunning, std::memory_order_acq_rel,
-        std::memory_order_acquire);
-    if (previous) {
-      *previous = expected;
-    }
-    return success;
+    return status_.compare_exchange_strong(expected, kRunning,
+                                           std::memory_order_acq_rel,
+                                           std::memory_order_acquire);
   }
 
   Task task_;
@@ -98,8 +91,8 @@ size_t CancelableTaskScheduler::CancelAndWait() {
 
 std::unique_ptr<CancelableTaskScheduler::TaskData>
 CancelableTaskScheduler::Register(Task task) {
-  base::AutoLock lock(lock_);
   auto task_data = std::make_unique<TaskData>(std::move(task), this);
+  base::AutoLock lock(lock_);
   tasks_.insert(task_data.get());
   return task_data;
 }