Backed out changeset 19b46672d236 (bug 1134841) for bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Wed, 06 May 2015 10:55:59 -0400
changeset 255299 95a6f19afe8a
parent 255298 a6edf943c3b7
child 255300 a37776f7389c
push id7980
push userryanvm@gmail.com
push date2015-05-06 14:56 +0000
treeherdermozilla-aurora@822f3d9e2cdf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1134841
milestone39.0a2
backs out19b46672d236
Backed out changeset 19b46672d236 (bug 1134841) for bustage.
dom/workers/ServiceWorkerManager.cpp
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -1019,29 +1019,26 @@ ServiceWorkerManager::AppendPendingOpera
 
 /*
  * Used to handle ExtendableEvent::waitUntil() and proceed with
  * installation/activation.
  */
 class LifecycleEventPromiseHandler final : public PromiseNativeHandler
 {
   nsMainThreadPtrHandle<ContinueLifecycleTask> mTask;
-  nsMainThreadPtrHandle<ServiceWorker> mServiceWorker;
   bool mActivateImmediately;
 
   virtual
   ~LifecycleEventPromiseHandler()
   { }
 
 public:
   LifecycleEventPromiseHandler(const nsMainThreadPtrHandle<ContinueLifecycleTask>& aTask,
-                               const nsMainThreadPtrHandle<ServiceWorker>& aServiceWorker,
                                bool aActivateImmediately)
     : mTask(aTask)
-    , mServiceWorker(aServiceWorker)
     , mActivateImmediately(aActivateImmediately)
   {
     MOZ_ASSERT(!NS_IsMainThread());
   }
 
   void
   ResolvedCallback(JSContext* aCx, JS::Handle<JS::Value> aValue) override
   {
@@ -1128,17 +1125,17 @@ LifecycleEventWorkerRunnable::DispatchLi
   InstallEvent* installEvent = event->AsInstallEvent();
   if (installEvent) {
     activateImmediately = installEvent->ActivateImmediately();
     // FIXME(nsm): Set activeWorker to the correct thing.
     // FIXME(nsm): Install error handler for any listener errors.
   }
 
   nsRefPtr<LifecycleEventPromiseHandler> handler =
-    new LifecycleEventPromiseHandler(mTask, mServiceWorker, activateImmediately);
+    new LifecycleEventPromiseHandler(mTask, activateImmediately);
   waitUntilPromise->AppendNativeHandler(handler);
   return true;
 }
 
 void
 ServiceWorkerRegistrationInfo::TryToActivate()
 {
   if (!IsControllingDocuments()) {