Bug 884061 - Part 3e: Use NS_DECL_THREADSAFE_ISUPPORTS in docshell/, r=bz
authorJoshua Cranmer <Pidgeot18@gmail.com>
Thu, 18 Jul 2013 21:21:19 -0500
changeset 140326 eb49396e9def51a527bbf267895af764949fb0db
parent 140325 56450c7bbda6a747c7e5a0777c6682817a4cfd08
child 140327 8ba67ee6a81d06211c8516b6d3b12c16f584efb4
push idunknown
push userunknown
push dateunknown
reviewersbz
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 3e: Use NS_DECL_THREADSAFE_ISUPPORTS in docshell/, r=bz
docshell/base/nsDSURIContentListener.cpp
docshell/base/nsDSURIContentListener.h
docshell/base/nsDocShell.cpp
docshell/base/nsDocShell.h
--- a/docshell/base/nsDSURIContentListener.cpp
+++ b/docshell/base/nsDSURIContentListener.cpp
@@ -47,18 +47,18 @@ nsDSURIContentListener::Init()
     return rv;
 }
 
 
 //*****************************************************************************
 // nsDSURIContentListener::nsISupports
 //*****************************************************************************   
 
-NS_IMPL_THREADSAFE_ADDREF(nsDSURIContentListener)
-NS_IMPL_THREADSAFE_RELEASE(nsDSURIContentListener)
+NS_IMPL_ADDREF(nsDSURIContentListener)
+NS_IMPL_RELEASE(nsDSURIContentListener)
 
 NS_INTERFACE_MAP_BEGIN(nsDSURIContentListener)
     NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIURIContentListener)
     NS_INTERFACE_MAP_ENTRY(nsIURIContentListener)
     NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
 NS_INTERFACE_MAP_END
 
 //*****************************************************************************
--- a/docshell/base/nsDSURIContentListener.h
+++ b/docshell/base/nsDSURIContentListener.h
@@ -18,17 +18,17 @@ class nsIHttpChannel;
 
 class nsDSURIContentListener :
     public nsIURIContentListener,
     public nsSupportsWeakReference
 
 {
 friend class nsDocShell;
 public:
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSIURICONTENTLISTENER
 
     nsresult Init();
 
 protected:
     nsDSURIContentListener(nsDocShell* aDocShell);
     virtual ~nsDSURIContentListener();
 
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -11725,18 +11725,18 @@ nsRefreshTimer::nsRefreshTimer()
 nsRefreshTimer::~nsRefreshTimer()
 {
 }
 
 //*****************************************************************************
 // nsRefreshTimer::nsISupports
 //*****************************************************************************   
 
-NS_IMPL_THREADSAFE_ADDREF(nsRefreshTimer)
-NS_IMPL_THREADSAFE_RELEASE(nsRefreshTimer)
+NS_IMPL_ADDREF(nsRefreshTimer)
+NS_IMPL_RELEASE(nsRefreshTimer)
 
 NS_INTERFACE_MAP_BEGIN(nsRefreshTimer)
     NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsITimerCallback)
     NS_INTERFACE_MAP_ENTRY(nsITimerCallback)
 NS_INTERFACE_MAP_END_THREADSAFE
 
 ///*****************************************************************************
 // nsRefreshTimer::nsITimerCallback
@@ -11765,17 +11765,17 @@ nsDocShell::InterfaceRequestorProxy::Int
     }
 }
  
 nsDocShell::InterfaceRequestorProxy::~InterfaceRequestorProxy()
 {
     mWeakPtr = nullptr;
 }
 
-NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocShell::InterfaceRequestorProxy, nsIInterfaceRequestor) 
+NS_IMPL_ISUPPORTS1(nsDocShell::InterfaceRequestorProxy, nsIInterfaceRequestor) 
   
 NS_IMETHODIMP 
 nsDocShell::InterfaceRequestorProxy::GetInterface(const nsIID & aIID, void **aSink)
 {
     NS_ENSURE_ARG_POINTER(aSink);
     nsCOMPtr<nsIInterfaceRequestor> ifReq = do_QueryReferent(mWeakPtr);
     if (ifReq) {
         return ifReq->GetInterface(aIID, aSink);
--- a/docshell/base/nsDocShell.h
+++ b/docshell/base/nsDocShell.h
@@ -104,17 +104,17 @@ enum ViewMode {
 //***    nsRefreshTimer
 //*****************************************************************************
 
 class nsRefreshTimer : public nsITimerCallback
 {
 public:
     nsRefreshTimer();
 
-    NS_DECL_ISUPPORTS
+    NS_DECL_THREADSAFE_ISUPPORTS
     NS_DECL_NSITIMERCALLBACK
 
     int32_t GetDelay() { return mDelay ;}
 
     nsRefPtr<nsDocShell>  mDocShell;
     nsCOMPtr<nsIURI>      mURI;
     int32_t               mDelay;
     bool                  mRepeat;
@@ -894,17 +894,17 @@ private:
     static unsigned long gNumberOfDocShells;
 #endif /* DEBUG */
 
 public:
     class InterfaceRequestorProxy : public nsIInterfaceRequestor {
     public:
         InterfaceRequestorProxy(nsIInterfaceRequestor* p);
         virtual ~InterfaceRequestorProxy();
-        NS_DECL_ISUPPORTS
+        NS_DECL_THREADSAFE_ISUPPORTS
         NS_DECL_NSIINTERFACEREQUESTOR
  
     protected:
         InterfaceRequestorProxy() {}
         nsWeakPtr mWeakPtr;
     };
 };