Bug 698860 - 'Workers: Cycle collector calls DOM worker from wrong thread'. r=sicking.
authorBen Turner <bent.mozilla@gmail.com>
Sat, 05 Nov 2011 12:45:35 -0700
changeset 80468 ae228e329b421e35e2b5b8e70586af6fa8c1fb29
parent 80467 e697147121b3258da64e1cea557bc43ded0987ce
child 80469 7e28b68cf25d0741579acad918d4592088ed3b52
push id506
push userclegnitto@mozilla.com
push dateWed, 09 Nov 2011 02:03:18 +0000
treeherdermozilla-aurora@63587fc7bb93 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssicking
bugs698860
milestone10.0a1
Bug 698860 - 'Workers: Cycle collector calls DOM worker from wrong thread'. r=sicking.
dom/workers/WorkerPrivate.h
--- a/dom/workers/WorkerPrivate.h
+++ b/dom/workers/WorkerPrivate.h
@@ -266,17 +266,19 @@ public:
   Suspend(JSContext* aCx);
 
   bool
   Resume(JSContext* aCx);
 
   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);
   }
 
   void
   FinalizeInstance(JSContext* aCx, bool aFromJSFinalizer);
 
   bool
   Terminate(JSContext* aCx)