From 94134a4a1d12df3afe09156c13ef4cd17dbfae12 Mon Sep 17 00:00:00 2001
From: Joshua Cranmer <Pidgeot18@gmail.com>
Date: Thu, 18 Jul 2013 21:31:36 -0500
Subject: [PATCH] Bug 884061 - Part 3z: Use NS_DECL_THREADSAFE_ISUPPORTS in
 xpfe/, r=Neil

--HG--
extra : rebase_source : a1e6681133934750015ec03c0f6a70122ec74b19
---
 xpfe/appshell/src/nsWebShellWindow.cpp | 7 ++-----
 xpfe/appshell/src/nsXULWindow.cpp      | 4 ++--
 xpfe/appshell/src/nsXULWindow.h        | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/xpfe/appshell/src/nsWebShellWindow.cpp b/xpfe/appshell/src/nsWebShellWindow.cpp
index 2859ad54c692..f3f325b09f55 100644
--- a/xpfe/appshell/src/nsWebShellWindow.cpp
+++ b/xpfe/appshell/src/nsWebShellWindow.cpp
@@ -453,7 +453,7 @@ public:
     : mWindow(aWindow)
   {}
 
-  NS_DECL_ISUPPORTS
+  NS_DECL_THREADSAFE_ISUPPORTS
 
   NS_IMETHOD Notify(nsITimer* aTimer)
   {
@@ -469,10 +469,7 @@ private:
   nsRefPtr<nsWebShellWindow> mWindow;
 };
 
-NS_IMPL_THREADSAFE_ADDREF(WebShellWindowTimerCallback)
-NS_IMPL_THREADSAFE_RELEASE(WebShellWindowTimerCallback)
-NS_IMPL_THREADSAFE_QUERY_INTERFACE1(WebShellWindowTimerCallback,
-                                    nsITimerCallback)
+NS_IMPL_ISUPPORTS1(WebShellWindowTimerCallback, nsITimerCallback)
 
 } // namespace mozilla
 
diff --git a/xpfe/appshell/src/nsXULWindow.cpp b/xpfe/appshell/src/nsXULWindow.cpp
index 77a0260ff6c5..5100ec58618c 100644
--- a/xpfe/appshell/src/nsXULWindow.cpp
+++ b/xpfe/appshell/src/nsXULWindow.cpp
@@ -116,8 +116,8 @@ nsXULWindow::~nsXULWindow()
 // nsXULWindow::nsISupports
 //*****************************************************************************
 
-NS_IMPL_THREADSAFE_ADDREF(nsXULWindow)
-NS_IMPL_THREADSAFE_RELEASE(nsXULWindow)
+NS_IMPL_ADDREF(nsXULWindow)
+NS_IMPL_RELEASE(nsXULWindow)
 
 NS_INTERFACE_MAP_BEGIN(nsXULWindow)
   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIXULWindow)
diff --git a/xpfe/appshell/src/nsXULWindow.h b/xpfe/appshell/src/nsXULWindow.h
index 08b6e5bd168d..30ba7170937f 100644
--- a/xpfe/appshell/src/nsXULWindow.h
+++ b/xpfe/appshell/src/nsXULWindow.h
@@ -59,7 +59,7 @@ friend class nsChromeTreeOwner;
 friend class nsContentTreeOwner;
 
 public:
-   NS_DECL_ISUPPORTS
+   NS_DECL_THREADSAFE_ISUPPORTS
 
    NS_DECL_NSIINTERFACEREQUESTOR
    NS_DECL_NSIXULWINDOW