Backed out changeset cf35c8eac882 (bug 1003766) for Werror bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 01 May 2014 14:09:54 -0400
changeset 181635 aaff0e8f5af2b100c377ac0f96711a9591acfe88
parent 181634 d92c11752f44d1e9704f837a678ee218f9254620
child 181636 4cb70de5fd6aea678aa5985a1eb92d4af1eab153
push id272
push userpvanderbeken@mozilla.com
push dateMon, 05 May 2014 16:31:18 +0000
bugs1003766
milestone32.0a1
backs outcf35c8eac8820e9c80914474835c4784e1c3dcfb
Backed out changeset cf35c8eac882 (bug 1003766) for Werror bustage. CLOSED TREE
dom/workers/WorkerRunnable.cpp
--- a/dom/workers/WorkerRunnable.cpp
+++ b/dom/workers/WorkerRunnable.cpp
@@ -394,22 +394,19 @@ StopSyncLoopRunnable::StopSyncLoopRunnab
   mWorkerPrivate->AssertValidSyncLoop(mSyncLoopTarget);
 #endif
 }
 
 NS_IMETHODIMP
 StopSyncLoopRunnable::Cancel()
 {
   nsresult rv = Run();
-  NS_WARN_IF(NS_FAILED(rv));
+  NS_ENSURE_SUCCESS(rv, rv);
 
-  nsresult rv2 = WorkerSyncRunnable::Cancel();
-  NS_WARN_IF(NS_FAILED(rv2));
-
-  return NS_FAILED(rv) ? rv : rv2;
+  return NS_OK;
 }
 
 bool
 StopSyncLoopRunnable::WorkerRun(JSContext* aCx,
                                 WorkerPrivate* aWorkerPrivate)
 {
   aWorkerPrivate->AssertIsOnWorkerThread();
   MOZ_ASSERT(mSyncLoopTarget);