| author | Wes Kocher <wkocher@mozilla.com> |
| Fri, 09 Jan 2015 14:28:27 -0800 | |
| changeset 223142 | 367eacf58b48ccbee563964a111086fcbc46b6ff |
| parent 223141 | 21a26d8e745748a8b34d8cf03d338c31c099a71c |
| child 223143 | eb4ffa05e89c100b85459f149264b3c2cd9b0461 |
| push id | 10769 |
| push user | cbook@mozilla.com |
| push date | Mon, 12 Jan 2015 14:15:52 +0000 |
| treeherder | fx-team@0e9765732906 [default view] [failures only] |
| perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
| milestone | 37.0a1 |
| backs out | 115690326c5eb417d374f0b0978657662b79a0fd |
--- 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 >= Killing) { + if (mStatus >= Canceling) { return false; } } NS_ASSERTION(!mFeatures.Contains(aFeature), "Already know about this one!"); mFeatures.AppendElement(aFeature); return mFeatures.Length() == 1 ?