Bug 952570 - Added an IID to the tickler
authorCraig MacKenzie <cemacken@gmail.com>
Thu, 09 Jan 2014 17:04:00 -0500
changeset 179041 fc819f136ef89f06985cd9d74904509aa2976190
parent 179040 951247ec2044345a252885d9c52be7cbcbaff7fd
child 179042 b3ccaf008518d2f8fd672be570dcb82044b21a60
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs952570
milestone29.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 952570 - Added an IID to the tickler
netwerk/base/src/Tickler.cpp
netwerk/base/src/Tickler.h
--- a/netwerk/base/src/Tickler.cpp
+++ b/netwerk/base/src/Tickler.cpp
@@ -13,17 +13,17 @@
 #include "nsThreadUtils.h"
 #include "prnetdb.h"
 
 #include "AndroidBridge.h"
 
 namespace mozilla {
 namespace net {
 
-NS_IMPL_ISUPPORTS1(Tickler, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS2(Tickler, nsISupportsWeakReference, Tickler)
 
 Tickler::Tickler()
     : mLock("Tickler::mLock")
     , mActive(false)
     , mCanceled(false)
     , mEnabled(false)
     , mDelay(16)
     , mDuration(TimeDuration::FromMilliseconds(400))
--- a/netwerk/base/src/Tickler.h
+++ b/netwerk/base/src/Tickler.h
@@ -48,20 +48,26 @@
 class nsIPrefBranch;
 #endif
 
 namespace mozilla {
 namespace net {
 
 #ifdef MOZ_USE_WIFI_TICKLER
 
+// 8f769ed6-207c-4af9-9f7e-9e832da3754e
+#define NS_TICKLER_IID \
+{ 0x8f769ed6, 0x207c, 0x4af9, \
+  { 0x9f, 0x7e, 0x9e, 0x83, 0x2d, 0xa3, 0x75, 0x4e } }
+
 class Tickler MOZ_FINAL : public nsSupportsWeakReference
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
+  NS_DECLARE_STATIC_IID_ACCESSOR(NS_TICKLER_IID)
 
   // These methods are main thread only
   Tickler();
   ~Tickler();
   void Cancel();
   nsresult Init();
   void SetIPV4Address(uint32_t address);
   void SetIPV4Port(uint16_t port);
@@ -93,16 +99,18 @@ private:
   void MaybeStartTicklerUnlocked();
 
   // Tickler thread only
   void CheckTickler();
   void StartTickler();
   void StopTickler();
 };
 
+NS_DEFINE_STATIC_IID_ACCESSOR(Tickler, NS_TICKLER_IID)
+
 #else // not defined MOZ_USE_WIFI_TICKLER
 
 class Tickler MOZ_FINAL : public nsISupports
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
 
   Tickler() { }