Bug 1157323 - Part 6: Some comment improvements. r=froydnj
authorByron Campen [:bwc] <docfaraday@gmail.com>
Fri, 05 Aug 2016 13:46:07 -0500
changeset 315364 40bb8f061490845dca8c73c40bd927a0dc483500
parent 315363 f33fe0269dea6849b6543a2f14df841739b3f9ba
child 315365 8de3dbbe8e3a3a5cefaf224f8d2764c4998d1afb
push id30748
push usercbook@mozilla.com
push dateWed, 28 Sep 2016 13:53:19 +0000
treeherdermozilla-central@8c84b7618840 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1157323
milestone52.0a1
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
Bug 1157323 - Part 6: Some comment improvements. r=froydnj MozReview-Commit-ID: GDLuJS0Wlgh
xpcom/threads/nsTimerImpl.h
--- a/xpcom/threads/nsTimerImpl.h
+++ b/xpcom/threads/nsTimerImpl.h
@@ -140,26 +140,26 @@ public:
                                       uint32_t aDelay,
                                       uint32_t aType,
                                       Name aName);
 
   // This is set by Init. It records the name (if there is one) for the timer,
   // for use when logging timer firings.
   Name mName;
 
-  // These members are set by Init and never reset.
-  CallbackType          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.
+  CallbackType          mCallbackType;
   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.
+  // This is only modified on the target thread, and only after removing the
+  // timer from the TimerThread. Is set on the arming thread, initially.
   int32_t               mGeneration;
 
   uint32_t              mDelay;
   TimeStamp             mTimeout;
 
 #ifdef MOZ_TASK_TRACER
   mozilla::tasktracer::TracedTaskCommon mTracedTask;
 #endif