From 32b41bb825f03503b3f20f350fe35f3ae183962d Mon Sep 17 00:00:00 2001 From: Ben Turner Date: Wed, 30 Apr 2014 13:44:03 -0700 Subject: [PATCH] Bug 1003766, StopSyncLoopRunnable::Cancel should call base class Cancel. r=mrbkap. --- dom/workers/WorkerRunnable.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dom/workers/WorkerRunnable.cpp b/dom/workers/WorkerRunnable.cpp index cd034b21fdd..da7e28493e0 100644 --- a/dom/workers/WorkerRunnable.cpp +++ b/dom/workers/WorkerRunnable.cpp @@ -399,9 +399,12 @@ NS_IMETHODIMP StopSyncLoopRunnable::Cancel() { nsresult rv = Run(); - NS_ENSURE_SUCCESS(rv, rv); + NS_WARN_IF(NS_FAILED(rv)); - return NS_OK; + nsresult rv2 = WorkerSyncRunnable::Cancel(); + NS_WARN_IF(NS_FAILED(rv2)); + + return NS_FAILED(rv) ? rv : rv2; } bool