Fix for bug 86107. Preferences needs to implement nsISupportsWeakReference. r=mitesh, sr=alecf, a=asa.

modules/libpref/src/nsPref.cpp

@@ -48,6 +48,7 @@
 #include "nsISecurityPref.h"
 #include "nsIPrefService.h"
 #include "nsISupportsPrimitives.h"
+#include "nsWeakReference.h"
 
 #include "nsIJSRuntimeService.h"
 #include "nsIModule.h"
@@ -63,7 +64,8 @@ class nsPref : public nsIPref,
                public nsIObserver,
                public nsIPrefBranch,
                public nsIPrefBranchInternal,
-               public nsISecurityPref
+               public nsISecurityPref,
+               public nsSupportsWeakReference
 {
 public:
   static nsPref *GetInstance();
@@ -124,7 +126,7 @@ nsPref* nsPref::gInstance = NULL;
 static PRInt32 g_InstanceCount = 0;
 
 
-NS_IMPL_THREADSAFE_ISUPPORTS6(nsPref, nsIPref, nsIPrefService, nsIObserver, nsIPrefBranch, nsIPrefBranchInternal, nsISecurityPref);
+NS_IMPL_THREADSAFE_ISUPPORTS7(nsPref, nsIPref, nsIPrefService, nsIObserver, nsIPrefBranch, nsIPrefBranchInternal, nsISecurityPref, nsISupportsWeakReference);
 
 //----------------------------------------------------------------------------------------
 nsPref::nsPref()

modules/libpref/src/nsPrefBranch.cpp

@@ -142,6 +142,7 @@ NS_INTERFACE_MAP_BEGIN(nsPrefBranch)
   NS_INTERFACE_MAP_ENTRY(nsIPrefBranch)
   NS_INTERFACE_MAP_ENTRY(nsIPrefBranchInternal)
   NS_INTERFACE_MAP_ENTRY(nsISecurityPref)
+  NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 

modules/libpref/src/nsPrefBranch.h

@@ -31,10 +31,12 @@
 #include "nsISupportsPrimitives.h"
 #include "nsString.h"
 #include "nsVoidArray.h"
+#include "nsWeakReference.h"
 
 class nsPrefBranch : public nsIPrefBranch,
                      public nsIPrefBranchInternal,
-                     public nsISecurityPref
+                     public nsISecurityPref,
+                     public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS

modules/libpref/src/nsPrefService.cpp

@@ -97,6 +97,7 @@ NS_INTERFACE_MAP_BEGIN(nsPrefService)
     NS_INTERFACE_MAP_ENTRY(nsIObserver)
     NS_INTERFACE_MAP_ENTRY(nsIPrefBranch)
     NS_INTERFACE_MAP_ENTRY(nsIPrefBranchInternal)
+    NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 

modules/libpref/src/nsPrefService.h

@@ -26,13 +26,15 @@
 #include "nsIPrefBranchInternal.h"
 #include "nsIObserver.h"
 #include "nsCOMPtr.h"
+#include "nsWeakReference.h"
 
 class nsIFile;
 
 class nsPrefService : public nsIPrefService,
                       public nsIObserver,
                       public nsIPrefBranch,
-                      public nsIPrefBranchInternal
+                      public nsIPrefBranchInternal,
+                      public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS