Bug 1119360: Allow AddFeature calls to succeed until we enter the Killing stage. r=bent
☠☠ backed out by 367eacf58b48 ☠ ☠
authorKyle Huey <khuey@kylehuey.com>
Fri, 09 Jan 2015 13:29:05 -0800
changeset 223074 115690326c5eb417d374f0b0978657662b79a0fd
parent 223073 bfab295de6328219709e34060bf41c2c5af6916c
child 223075 7475b716558d7543e6762b7d61f4be1951cd790e
push id28082
push usercbook@mozilla.com
push dateMon, 12 Jan 2015 10:44:52 +0000
treeherdermozilla-central@643589c3ef94 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent
bugs1119360
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1119360: Allow AddFeature calls to succeed until we enter the Killing stage. r=bent
dom/workers/WorkerPrivate.cpp
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -5057,17 +5057,17 @@ WorkerPrivate::RemoveChildWorker(JSConte
 bool
 WorkerPrivate::AddFeature(JSContext* aCx, WorkerFeature* aFeature)
 {
   AssertIsOnWorkerThread();
 
   {
     MutexAutoLock lock(mMutex);
 
-    if (mStatus >= Canceling) {
+    if (mStatus >= Killing) {
       return false;
     }
   }
 
   NS_ASSERTION(!mFeatures.Contains(aFeature), "Already know about this one!");
   mFeatures.AppendElement(aFeature);
 
   return mFeatures.Length() == 1 ?