Bug 1110487 P4 Allow Cache Action objects to be canceled more than once.

rmottola · Jun 26, 2019 · 8734ce1 · 8734ce1
1 parent 0278071
commit 8734ce1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/dom/cache/Action.cpp b/dom/cache/Action.cpp
@@ -14,7 +14,9 @@ void
 Action::CancelOnInitiatingThread()
 {
   NS_ASSERT_OWNINGTHREAD(Action);
-  MOZ_ASSERT(!mCanceled);
+  // It is possible for cancellation to be duplicated.  For example, an
+  // individual Cache could have its Actions canceled and then shutdown
+  // could trigger a second action.
   mCanceled = true;
 }
 

diff --git a/dom/cache/Action.h b/dom/cache/Action.h
@@ -49,6 +49,9 @@ class Action
   // Cancellation is a best effort to stop processing as soon as possible, but
   // does not guarantee the Action will not run.
   //
+  // CancelOnInitiatingThread() may be called more than once.  Subsequent
+  // calls should have no effect.
+  //
   // Default implementation sets an internal cancellation flag that can be
   // queried with IsCanceled().
   virtual void CancelOnInitiatingThread();