Bug 1013748 - Use StaticRefPtr to hold BluetoothService objects, f=sh…

…uang, r=tzimmermann, r=khuey
dothq · Aug 25, 2014 · 0c8483a · 0c8483a
1 parent d0c5f56
commit 0c8483a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/dom/bluetooth/ipc/BluetoothChild.cpp b/dom/bluetooth/ipc/BluetoothChild.cpp
@@ -9,6 +9,8 @@
 #include "BluetoothChild.h"
 
 #include "mozilla/Assertions.h"
+#include "mozilla/ClearOnShutdown.h"
+#include "mozilla/StaticPtr.h"
 #include "nsDebug.h"
 #include "nsISupportsImpl.h"
 #include "nsThreadUtils.h"
@@ -17,11 +19,12 @@
 #include "BluetoothService.h"
 #include "BluetoothServiceChildProcess.h"
 
+using namespace mozilla;
 USING_BLUETOOTH_NAMESPACE
 
 namespace {
 
-BluetoothServiceChildProcess* sBluetoothService;
+StaticRefPtr<BluetoothServiceChildProcess> sBluetoothService;
 
 } // anonymous namespace
 
@@ -37,6 +40,7 @@ BluetoothChild::BluetoothChild(BluetoothServiceChildProcess* aBluetoothService)
   MOZ_ASSERT(aBluetoothService);
 
   sBluetoothService = aBluetoothService;
+  ClearOnShutdown(&sBluetoothService);
 }
 
 BluetoothChild::~BluetoothChild()