Backed out changeset 37c9e9d07aac (bug 1351148)
authorStone Shih <sshih@mozilla.com>
Fri, 11 Aug 2017 15:19:51 +0800
changeset 374252 248262b1622974d0ca5028ade262e1a7420c74f2
parent 374251 8a7493af9f6c674e2b65c8b1f506db3ecc76b58a
child 374253 6d6828f3fb906229db08e45c9929476c792de175
push id32318
push userkwierso@gmail.com
push dateFri, 11 Aug 2017 20:16:01 +0000
treeherdermozilla-central@80ff3f300e05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1351148
milestone57.0a1
backs out37c9e9d07aacd7799b2fb5836469345bfa9f94f9
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 37c9e9d07aac (bug 1351148)
xpcom/threads/TimerThread.h
xpcom/threads/nsTimerImpl.h
--- a/xpcom/threads/TimerThread.h
+++ b/xpcom/threads/TimerThread.h
@@ -14,17 +14,16 @@
 #include "nsTimerImpl.h"
 #include "nsThreadUtils.h"
 
 #include "nsTArray.h"
 
 #include "mozilla/Atomics.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/Monitor.h"
-#include "mozilla/UniquePtr.h"
 
 #include <algorithm>
 
 namespace mozilla {
 class TimeStamp;
 } // namespace mozilla
 
 class TimerThread final
@@ -106,31 +105,30 @@ private:
     {
       if (mTimerImpl) {
         mTimerImpl->SetHolder(nullptr);
       }
       return mTimerImpl.forget();
     }
 
     static bool
-    UniquePtrLessThan(mozilla::UniquePtr<Entry>& aLeft,
-                      mozilla::UniquePtr<Entry>& aRight)
+    UniquePtrLessThan(UniquePtr<Entry>& aLeft, UniquePtr<Entry>& aRight)
     {
       // This is reversed because std::push_heap() sorts the "largest" to
       // the front of the heap.  We want that to be the earliest timer.
       return aRight->mTimeout < aLeft->mTimeout;
     }
 
     TimeStamp Timeout() const
     {
       return mTimeout;
     }
   };
 
-  nsTArray<mozilla::UniquePtr<Entry>> mTimers;
+  nsTArray<UniquePtr<Entry>> mTimers;
   uint32_t mAllowedEarlyFiringMicroseconds;
 };
 
 struct TimerAdditionComparator
 {
   TimerAdditionComparator(const mozilla::TimeStamp& aNow,
                           nsTimerImpl* aTimerToInsert) :
     now(aNow)
--- a/xpcom/threads/nsTimerImpl.h
+++ b/xpcom/threads/nsTimerImpl.h
@@ -127,17 +127,17 @@ public:
     Name mName;
 
     void*                 mClosure;
   };
 
   nsresult InitCommon(uint32_t aDelayMS, uint32_t aType,
                       Callback&& newCallback);
 
-  nsresult InitCommon(const mozilla::TimeDuration& aDelay, uint32_t aType,
+  nsresult InitCommon(const TimeDuration& aDelay, uint32_t aType,
                       Callback&& newCallback);
 
   Callback& GetCallback()
   {
     mMutex.AssertCurrentThreadOwns();
     if (mCallback.mType == Callback::Type::Unknown) {
       return mCallbackDuringFire;
     }
@@ -195,19 +195,19 @@ public:
   uint8_t               mType;
 
   // 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.
   // Updated only after this timer has been removed from the timer thread.
   int32_t               mGeneration;
 
-  mozilla::TimeDuration mDelay;
+  TimeDuration          mDelay;
   // Updated only after this timer has been removed from the timer thread.
-  mozilla::TimeStamp    mTimeout;
+  TimeStamp             mTimeout;
 
 #ifdef MOZ_TASK_TRACER
   mozilla::tasktracer::TracedTaskCommon mTracedTask;
 #endif
 
   static double         sDeltaSum;
   static double         sDeltaSumSquared;
   static double         sDeltaNum;