From 886074f2e3bf83008cf8a465fa9cfc7b7374c1e2 Mon Sep 17 00:00:00 2001
From: Nicholas Nethercote <nnethercote@mozilla.com>
Date: Mon, 14 Sep 2015 15:57:17 -0700
Subject: [PATCH] Bug 1203427 (part 3) - Change order of InitCommon()
 arguments. r=froydnj.

This makes the order of |aDelay| and |aType| match those of the InitWith*()
functions.

I've made this change because the inconsistency tripped me up during the
development of part 4.

--HG--
extra : rebase_source : 7d49f3f643e76955ea3de57e0954deb22cda3ddf
---
 xpcom/threads/nsTimerImpl.cpp | 8 ++++----
 xpcom/threads/nsTimerImpl.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp
index 91b646e79024..cddd7a9de52f 100644
--- a/xpcom/threads/nsTimerImpl.cpp
+++ b/xpcom/threads/nsTimerImpl.cpp
@@ -188,7 +188,7 @@ nsTimerImpl::Shutdown()
 
 
 nsresult
-nsTimerImpl::InitCommon(uint32_t aType, uint32_t aDelay)
+nsTimerImpl::InitCommon(uint32_t aDelay, uint32_t aType)
 {
   nsresult rv;
 
@@ -231,7 +231,7 @@ nsTimerImpl::InitWithFuncCallback(nsTimerCallbackFunc aFunc,
   mCallback.c = aFunc;
   mClosure = aClosure;
 
-  return InitCommon(aType, aDelay);
+  return InitCommon(aDelay, aType);
 }
 
 NS_IMETHODIMP
@@ -248,7 +248,7 @@ nsTimerImpl::InitWithCallback(nsITimerCallback* aCallback,
   mCallback.i = aCallback;
   NS_ADDREF(mCallback.i);
 
-  return InitCommon(aType, aDelay);
+  return InitCommon(aDelay, aType);
 }
 
 NS_IMETHODIMP
@@ -263,7 +263,7 @@ nsTimerImpl::Init(nsIObserver* aObserver, uint32_t aDelay, uint32_t aType)
   mCallback.o = aObserver;
   NS_ADDREF(mCallback.o);
 
-  return InitCommon(aType, aDelay);
+  return InitCommon(aDelay, aType);
 }
 
 NS_IMETHODIMP
diff --git a/xpcom/threads/nsTimerImpl.h b/xpcom/threads/nsTimerImpl.h
index a307d15fdf84..3cef6e81a27b 100644
--- a/xpcom/threads/nsTimerImpl.h
+++ b/xpcom/threads/nsTimerImpl.h
@@ -77,7 +77,7 @@ private:
   };
 
   ~nsTimerImpl();
-  nsresult InitCommon(uint32_t aType, uint32_t aDelay);
+  nsresult InitCommon(uint32_t aDelay, uint32_t aType);
 
   void ReleaseCallback()
   {