From 5827a2f72c8abf3502054ae24a46faf112adf2a5 Mon Sep 17 00:00:00 2001
From: Ben Turner <bent.mozilla@gmail.com>
Date: Sat, 5 Nov 2011 12:45:35 -0700
Subject: [PATCH] Bug 698860 - 'Workers: Cycle collector calls DOM worker from
 wrong thread'. r=sicking.

---
 dom/workers/WorkerPrivate.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dom/workers/WorkerPrivate.h b/dom/workers/WorkerPrivate.h
index c1fa0046d6e..f20fb42164d 100644
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -271,7 +271,9 @@ public:
   void
   TraceInstance(JSTracer* aTrc)
   {
-    AssertIsOnParentThread();
+    // This should only happen on the parent thread but we can't assert that
+    // because it can also happen on the cycle collector thread when this is a
+    // top-level worker.
     events::EventTarget::TraceInstance(aTrc);
   }