Bug 1348738 - (Part 0) Convert nsRepeatService::gInstance to be a file-scoped StaticRefPtr. r=dholbert

MozReview-Commit-ID: KSLs2tEFf7m

--HG--
extra : rebase_source : 902d743ab118e9ff93a364fec13f78eb118e3c73

layout/xul/nsRepeatService.cpp

@@ -13,7 +13,9 @@
 #include "nsRepeatService.h"
 #include "nsIServiceManager.h"
 
-nsRepeatService* nsRepeatService::gInstance = nullptr;
+using namespace mozilla;
+
+static StaticRefPtr<nsRepeatService> gRepeatService;
 
 nsRepeatService::nsRepeatService()
 : mCallback(nullptr), mCallbackData(nullptr)
@@ -25,20 +27,19 @@ nsRepeatService::~nsRepeatService()
   NS_ASSERTION(!mCallback && !mCallbackData, "Callback was not removed before shutdown");
 }
 
-nsRepeatService* 
+/* static */ nsRepeatService*
 nsRepeatService::GetInstance()
 {
-  if (!gInstance) {
-    gInstance = new nsRepeatService();
-    NS_IF_ADDREF(gInstance);
+  if (!gRepeatService) {
+    gRepeatService = new nsRepeatService();
   }
-  return gInstance;
+  return gRepeatService;
 }
 
 /*static*/ void
 nsRepeatService::Shutdown()
 {
-  NS_IF_RELEASE(gInstance);
+  gRepeatService = nullptr;
 }
 
 void nsRepeatService::Start(Callback aCallback, void* aCallbackData,

layout/xul/nsRepeatService.h

@@ -53,7 +53,6 @@ private:
   Callback           mCallback;
   void*              mCallbackData;
   nsCOMPtr<nsITimer> mRepeatTimer;
-  static nsRepeatService* gInstance;
 
 }; // class nsRepeatService