mozilla-central: changeset 223074:115690326c5eb417d374f0b0978657662b79a0fd

☠☠ backed out by 367eacf58b48 ☠ ☠
author	Kyle Huey <khuey@kylehuey.com>
	Fri, 09 Jan 2015 13:29:05 -0800
changeset 223074	115690326c5eb417d374f0b0978657662b79a0fd
parent 223073	bfab295de6328219709e34060bf41c2c5af6916c
child 223075	7475b716558d7543e6762b7d61f4be1951cd790e
push id	28082
push user	cbook@mozilla.com
push date	Mon, 12 Jan 2015 10:44:52 +0000
treeherder	mozilla-central@643589c3ef94 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	bent
bugs	1119360
milestone	37.0a1
first release with	nightly linux32 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly linux64 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly mac 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly win32 643589c3ef94 / 37.0a1 / 20150112030201 / files nightly win64 643589c3ef94 / 37.0a1 / 20150112030201 / files
last release without	nightly linux32 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly linux64 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly mac b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly win32 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files nightly win64 b3f84cf78dc2 / 37.0a1 / 20150109030224 / files

--- 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 ?