Bug 884061 - Part 3h: Use NS_DECL_THREADSAFE_ISUPPORTS in extensions/, r=bsmedberg
authorJoshua Cranmer <Pidgeot18@gmail.com>
Thu, 18 Jul 2013 21:23:04 -0500
changeset 152775 0f38536304e145cfc27719e11e0bb78dd08993d7
parent 152774 c073457f6b02d0e1d383f9897befe585fdbc2981
child 152776 bc8cc4a1818daa768fa77973e47d5733c1718461
push id382
push userakeybl@mozilla.com
push dateMon, 21 Oct 2013 21:47:13 +0000
treeherdermozilla-release@5f1868ee45cb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs884061
milestone25.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 884061 - Part 3h: Use NS_DECL_THREADSAFE_ISUPPORTS in extensions/, r=bsmedberg
extensions/auth/nsAuthGSSAPI.cpp
extensions/auth/nsAuthGSSAPI.h
extensions/auth/nsAuthSASL.cpp
extensions/auth/nsAuthSASL.h
extensions/gio/nsGIOProtocolHandler.cpp
extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
extensions/pref/autoconfig/src/nsAutoConfig.cpp
extensions/pref/autoconfig/src/nsAutoConfig.h
extensions/pref/autoconfig/src/nsReadConfig.cpp
extensions/pref/autoconfig/src/nsReadConfig.h
--- a/extensions/auth/nsAuthGSSAPI.cpp
+++ b/extensions/auth/nsAuthGSSAPI.cpp
@@ -326,17 +326,17 @@ nsAuthGSSAPI::Shutdown()
 {
     if (gssLibrary) {
         PR_UnloadLibrary(gssLibrary);
         gssLibrary = nullptr;
     }
 }
 
 /* Limitations apply to this class's thread safety. See the header file */
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsAuthGSSAPI, nsIAuthModule)
+NS_IMPL_ISUPPORTS1(nsAuthGSSAPI, nsIAuthModule)
 
 NS_IMETHODIMP
 nsAuthGSSAPI::Init(const char *serviceName,
                    uint32_t    serviceFlags,
                    const PRUnichar *domain,
                    const PRUnichar *username,
                    const PRUnichar *password)
 {
--- a/extensions/auth/nsAuthGSSAPI.h
+++ b/extensions/auth/nsAuthGSSAPI.h
@@ -33,17 +33,17 @@
  * multiple threads. The nature of the GSSAPI protocol is such that a correct 
  * implementation will never call methods in parallel, as the results of the 
  * last call are required as input to the next.
  */
 
 class nsAuthGSSAPI MOZ_FINAL : public nsIAuthModule
 {
 public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIAUTHMODULE
 
     nsAuthGSSAPI(pType package);
 
     static void Shutdown();
 
 private:
     ~nsAuthGSSAPI() { Reset(); }
--- a/extensions/auth/nsAuthSASL.cpp
+++ b/extensions/auth/nsAuthSASL.cpp
@@ -18,17 +18,17 @@ nsAuthSASL::nsAuthSASL()
 }
 
 void nsAuthSASL::Reset() 
 {
     mSASLReady = false;
 }
 
 /* Limitations apply to this class's thread safety. See the header file */
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsAuthSASL, nsIAuthModule)
+NS_IMPL_ISUPPORTS1(nsAuthSASL, nsIAuthModule)
 
 NS_IMETHODIMP
 nsAuthSASL::Init(const char *serviceName,
                  uint32_t    serviceFlags,
                  const PRUnichar *domain,
                  const PRUnichar *username,
                  const PRUnichar *password)
 {
--- a/extensions/auth/nsAuthSASL.h
+++ b/extensions/auth/nsAuthSASL.h
@@ -14,17 +14,17 @@
 /* This class is implemented using the nsAuthGSSAPI class, and the same
  * thread safety constraints which are documented in nsAuthGSSAPI.h
  * apply to this class
  */
 
 class nsAuthSASL MOZ_FINAL : public nsIAuthModule
 {
 public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIAUTHMODULE
 
     nsAuthSASL();
 
 private:
     ~nsAuthSASL() { Reset(); }
 
     void Reset();
--- a/extensions/gio/nsGIOProtocolHandler.cpp
+++ b/extensions/gio/nsGIOProtocolHandler.cpp
@@ -133,17 +133,17 @@ static void mount_operation_ask_password
                                           const char        *default_domain,
                                           GAskPasswordFlags flags,
                                           gpointer          user_data);
 //-----------------------------------------------------------------------------
 
 class nsGIOInputStream MOZ_FINAL : public nsIInputStream
 {
   public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIINPUTSTREAM
 
     nsGIOInputStream(const nsCString &uriSpec)
       : mSpec(uriSpec)
       , mChannel(nullptr)
       , mHandle(nullptr)
       , mStream(nullptr)
       , mBytesRemaining(UINT64_MAX)
@@ -575,17 +575,17 @@ nsGIOInputStream::SetContentTypeOfChanne
   }
   else
   {
     rv = NS_DispatchToMainThread(ev);
   }
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsGIOInputStream, nsIInputStream)
+NS_IMPL_ISUPPORTS1(nsGIOInputStream, nsIInputStream)
 
 /**
  * Free all used memory and close stream.
  */
 NS_IMETHODIMP
 nsGIOInputStream::Close()
 {
   if (mStream)
--- a/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
+++ b/extensions/gnomevfs/nsGnomeVFSProtocolHandler.cpp
@@ -309,17 +309,17 @@ FileInfoComparator(gconstpointer a, gcon
   return strcasecmp(ia->name, ib->name);
 }
 
 //-----------------------------------------------------------------------------
 
 class nsGnomeVFSInputStream MOZ_FINAL : public nsIInputStream
 {
   public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIINPUTSTREAM
 
     nsGnomeVFSInputStream(const nsCString &uriSpec)
       : mSpec(uriSpec)
       , mChannel(nullptr)
       , mHandle(nullptr)
       , mBytesRemaining(UINT64_MAX)
       , mStatus(NS_OK)
@@ -626,17 +626,17 @@ nsGnomeVFSInputStream::SetContentTypeOfC
   }
   else
   {
     rv = NS_DispatchToMainThread(ev);
   }
   return rv;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsGnomeVFSInputStream, nsIInputStream)
+NS_IMPL_ISUPPORTS1(nsGnomeVFSInputStream, nsIInputStream)
 
 NS_IMETHODIMP
 nsGnomeVFSInputStream::Close()
 {
   if (mHandle)
   {
     gnome_vfs_close(mHandle);
     mHandle = nullptr;
--- a/extensions/pref/autoconfig/src/nsAutoConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsAutoConfig.cpp
@@ -28,17 +28,17 @@ PRLogModuleInfo *MCD;
 extern nsresult EvaluateAdminConfigScript(const char *js_buffer, size_t length,
                                           const char *filename, 
                                           bool bGlobalContext, 
                                           bool bCallbacks, 
                                           bool skipFirstLine);
 
 // nsISupports Implementation
 
-NS_IMPL_THREADSAFE_ISUPPORTS6(nsAutoConfig, nsIAutoConfig, nsITimerCallback, nsIStreamListener, nsIObserver, nsIRequestObserver, nsISupportsWeakReference)
+NS_IMPL_ISUPPORTS6(nsAutoConfig, nsIAutoConfig, nsITimerCallback, nsIStreamListener, nsIObserver, nsIRequestObserver, nsISupportsWeakReference)
 
 nsAutoConfig::nsAutoConfig()
 {
 }
 
 nsresult nsAutoConfig::Init()
 {
     // member initializers and constructor code
--- a/extensions/pref/autoconfig/src/nsAutoConfig.h
+++ b/extensions/pref/autoconfig/src/nsAutoConfig.h
@@ -16,17 +16,17 @@ class nsAutoConfig : public nsIAutoConfi
                      public nsITimerCallback,
                      public nsIStreamListener,
                      public nsIObserver,
                      public nsSupportsWeakReference
 
 {
     public:
 
-        NS_DECL_ISUPPORTS
+        NS_DECL_THREADSAFE_ISUPPORTS
         NS_DECL_NSIAUTOCONFIG
         NS_DECL_NSIREQUESTOBSERVER
         NS_DECL_NSISTREAMLISTENER
         NS_DECL_NSIOBSERVER
         NS_DECL_NSITIMERCALLBACK
 
         nsAutoConfig();
         virtual ~nsAutoConfig();
--- a/extensions/pref/autoconfig/src/nsReadConfig.cpp
+++ b/extensions/pref/autoconfig/src/nsReadConfig.cpp
@@ -68,17 +68,17 @@ static void DisplayError(void)
     if (NS_FAILED(rv))
         return;
 
     promptService->Alert(nullptr, title.get(), err.get());
 }
 
 // nsISupports Implementation
 
-NS_IMPL_THREADSAFE_ISUPPORTS2(nsReadConfig, nsIReadConfig, nsIObserver)
+NS_IMPL_ISUPPORTS2(nsReadConfig, nsIReadConfig, nsIObserver)
 
 nsReadConfig::nsReadConfig() :
     mRead(false)
 {
     if (!MCD)
       MCD = PR_NewLogModule("MCD");
 }
 
--- a/extensions/pref/autoconfig/src/nsReadConfig.h
+++ b/extensions/pref/autoconfig/src/nsReadConfig.h
@@ -10,17 +10,17 @@
 
 
 class nsReadConfig : public nsIReadConfig,
                      public nsIObserver
 {
 
     public:
 
-        NS_DECL_ISUPPORTS
+        NS_DECL_THREADSAFE_ISUPPORTS
         NS_DECL_NSIREADCONFIG
         NS_DECL_NSIOBSERVER
 
         nsReadConfig();
         virtual ~nsReadConfig();
 
         nsresult Init();