diff -r 000000000000 -r 6474c204b198 xpcom/threads/nsTimerImpl.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/xpcom/threads/nsTimerImpl.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,158 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef nsTimerImpl_h___
+#define nsTimerImpl_h___
+
+//#define FORCE_PR_LOG /* Allow logging in the release build */
+
+#include "nsITimer.h"
+#include "nsIEventTarget.h"
+#include "nsIObserver.h"
+
+#include "nsCOMPtr.h"
+
+#include "prlog.h"
+#include "mozilla/TimeStamp.h"
+#include "mozilla/Attributes.h"
+
+#ifdef MOZ_TASK_TRACER
+#include "TracedTaskCommon.h"
+#endif
+
+#if defined(PR_LOGGING)
+extern PRLogModuleInfo *GetTimerLog();
+#define DEBUG_TIMERS 1
+#else
+#undef DEBUG_TIMERS
+#endif
+
+#define NS_TIMER_CID \
+{ /* 5ff24248-1dd2-11b2-8427-fbab44f29bc8 */         \
+     0x5ff24248,                                     \
+     0x1dd2,                                         \
+     0x11b2,                                         \
+    {0x84, 0x27, 0xfb, 0xab, 0x44, 0xf2, 0x9b, 0xc8} \
+}
+
+enum {
+  CALLBACK_TYPE_UNKNOWN   = 0,
+  CALLBACK_TYPE_INTERFACE = 1,
+  CALLBACK_TYPE_FUNC      = 2,
+  CALLBACK_TYPE_OBSERVER  = 3
+};
+
+class nsTimerImpl MOZ_FINAL : public nsITimer
+{
+public:
+  typedef mozilla::TimeStamp TimeStamp;
+
+  nsTimerImpl();
+
+  static NS_HIDDEN_(nsresult) Startup();
+  static NS_HIDDEN_(void) Shutdown();
+
+  friend class TimerThread;
+  friend struct TimerAdditionComparator;
+
+  void Fire();
+  // If a failure is encountered, the reference is returned to the caller
+  static already_AddRefed<nsTimerImpl> PostTimerEvent(
+      already_AddRefed<nsTimerImpl> aTimerRef);
+  void SetDelayInternal(uint32_t aDelay);
+
+  NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECL_NSITIMER
+
+  int32_t GetGeneration() { return mGeneration; }
+
+#ifdef MOZ_TASK_TRACER
+  void DispatchTracedTask()
+  {
+    mTracedTask = mozilla::tasktracer::CreateFakeTracedTask(*(int**)(this));
+  }
+#endif
+
+private:
+  ~nsTimerImpl();
+  nsresult InitCommon(uint32_t aType, uint32_t aDelay);
+
+  void ReleaseCallback()
+  {
+    // if we're the last owner of the callback object, make
+    // sure that we don't recurse into ReleaseCallback in case
+    // the callback's destructor calls Cancel() or similar.
+    uint8_t cbType = mCallbackType;
+    mCallbackType = CALLBACK_TYPE_UNKNOWN; 
+
+    if (cbType == CALLBACK_TYPE_INTERFACE)
+      NS_RELEASE(mCallback.i);
+    else if (cbType == CALLBACK_TYPE_OBSERVER)
+      NS_RELEASE(mCallback.o);
+  }
+
+  bool IsRepeating() const {
+    PR_STATIC_ASSERT(TYPE_ONE_SHOT < TYPE_REPEATING_SLACK);
+    PR_STATIC_ASSERT(TYPE_REPEATING_SLACK < TYPE_REPEATING_PRECISE);
+    PR_STATIC_ASSERT(TYPE_REPEATING_PRECISE < TYPE_REPEATING_PRECISE_CAN_SKIP);
+    return mType >= TYPE_REPEATING_SLACK;
+  }
+
+  bool IsRepeatingPrecisely() const {
+    return mType >= TYPE_REPEATING_PRECISE;
+  }
+
+  nsCOMPtr<nsIEventTarget> mEventTarget;
+
+  void *                mClosure;
+
+  union CallbackUnion {
+    nsTimerCallbackFunc c;
+    nsITimerCallback *  i;
+    nsIObserver *       o;
+  } mCallback;
+
+  // Some callers expect to be able to access the callback while the
+  // timer is firing.
+  nsCOMPtr<nsITimerCallback> mTimerCallbackWhileFiring;
+
+  // These members are set by Init (called from NS_NewTimer) and never reset.
+  uint8_t               mCallbackType;
+
+  // These members are set by the initiating thread, when the timer's type is
+  // changed and during the period where it fires on that thread.
+  uint8_t               mType;
+  bool                  mFiring;
+
+
+  // Use a bool (int) here to isolate loads and stores of these two members
+  // done on various threads under the protection of TimerThread::mLock, from
+  // loads and stores done on the initiating/type-changing/timer-firing thread
+  // to the above uint8_t/bool members.
+  bool                  mArmed;
+  bool                  mCanceled;
+
+  // The generation number of this timer, re-generated each time the timer is
+  // initialized so one-shot timers can be canceled and re-initialized by the
+  // arming thread without any bad race conditions.
+  int32_t               mGeneration;
+
+  uint32_t              mDelay;
+  TimeStamp             mTimeout;
+
+#ifdef MOZ_TASK_TRACER
+  nsAutoPtr<mozilla::tasktracer::FakeTracedTask> mTracedTask;
+#endif
+
+#ifdef DEBUG_TIMERS
+  TimeStamp             mStart, mStart2;
+  static double         sDeltaSum;
+  static double         sDeltaSumSquared;
+  static double         sDeltaNum;
+#endif
+
+};
+
+#endif /* nsTimerImpl_h___ */