Bug#92793

BeOS classes are not threadsafe

In BeOS, each window runs in its own thread.  Because of this,
we have a proxy layer between the mozilla UI thread, and calls made
within the window's thread via CallMethod().  However, since the windows
are still running in their own thread, and reference counting takes place within
that thread, we need to reference and de-reference outselves atomically.

r=rpotts
sr=blizzard
a=asa

intl/uconv/src/nsBeOSCharset.cpp

@@ -34,8 +34,13 @@
 #include "nsReadableUtils.h"
 #include "nsPlatformCharset.h"
 
-
-NS_IMPL_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset);
+// In BeOS, each window runs in its own thread.  Because of this,
+// we have a proxy layer between the mozilla UI thread, and calls made
+// within the window's thread via CallMethod().  However, since the windows
+// are still running in their own thread, and reference counting takes place within
+// that thread, we need to reference and de-reference outselves atomically.
+// See BugZilla Bug# 92793
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsPlatformCharset, nsIPlatformCharset);
 
 nsPlatformCharset::nsPlatformCharset()
 {

widget/src/beos/nsAppShell.cpp

@@ -92,7 +92,7 @@ static sem_id my_find_sem(const char *name)
 //
 //-------------------------------------------------------------------------
 NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID);
-NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell)
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsAppShell, nsIAppShell)
 
 //-------------------------------------------------------------------------
 //

widget/src/beos/nsButton.cpp

@@ -52,9 +52,6 @@ static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
 static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID);
 
 
-NS_IMPL_ADDREF(nsButton)
-NS_IMPL_RELEASE(nsButton)
-
 //-------------------------------------------------------------------------
 //
 // nsButton constructor

widget/src/beos/nsButton.h

@@ -60,8 +60,6 @@ public:
 
    //nsISupports
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
-  NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
-  NS_IMETHOD_(nsrefcnt) Release(void);                                      
   
   // nsIButton part
   NS_IMETHOD SetLabel(const nsString& aText);

widget/src/beos/nsCheckButton.cpp

@@ -47,9 +47,6 @@
 
 #include "nsIDeviceContext.h"
 
-NS_IMPL_ADDREF(nsCheckButton)
-NS_IMPL_RELEASE(nsCheckButton)
-
 //-------------------------------------------------------------------------
 //
 // nsCheckButton constructor

widget/src/beos/nsCheckButton.h

@@ -60,8 +60,6 @@ public:
 
     // nsISupports
     NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
-    NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
-    NS_IMETHOD_(nsrefcnt) Release(void);                                      
   
     // nsICheckButton part
     NS_IMETHOD SetLabel(const nsString &aText);

widget/src/beos/nsLabel.cpp

@@ -44,9 +44,6 @@
 #include "nsIFontMetrics.h"
 #include "nsIDeviceContext.h"
 
-NS_IMPL_ADDREF(nsLabel)
-NS_IMPL_RELEASE(nsLabel)
-
 //-------------------------------------------------------------------------
 //
 // nsLabel constructor

widget/src/beos/nsLabel.h

@@ -60,8 +60,6 @@ public:
 
    // nsISupports
   NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
-  NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
-  NS_IMETHOD_(nsrefcnt) Release(void);          
 
   // nsILabel part
   NS_IMETHOD SetLabel(const nsString &aText);

widget/src/beos/nsScrollbar.cpp

@@ -48,8 +48,8 @@
 // nsISupports 
 //
 //-------------------------------------------------------------------------
-NS_IMPL_ADDREF(nsScrollbar)
-NS_IMPL_RELEASE(nsScrollbar)
+NS_IMPL_ADDREF_INHERITED(nsScrollbar, nsWindow)
+NS_IMPL_RELEASE_INHERITED(nsScrollbar, nsWindow)
 NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsWindow)
 
 //-------------------------------------------------------------------------

widget/src/beos/nsScrollbar.h

@@ -1,107 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsScrollbar_h__
-#define nsScrollbar_h__
-
-#include "nsISupportsUtils.h"
-#include "nsdefs.h"
-#include "nsWindow.h"
-#include "nsSwitchToUIThread.h"
-
-#include "nsIScrollbar.h"
-
-#include <ScrollBar.h>
-
-class nsScrollbarBeOS;
-
-/**
- * Native BeOS scrollbar wrapper. 
- */
-
-class nsScrollbar : public nsWindow,
-                    public nsIScrollbar
-{
-
-    // nsISupports
-    NS_DECL_ISUPPORTS
-
-public:
-                            nsScrollbar(PRBool aIsVertical);
-    virtual                 ~nsScrollbar();
-
-    NS_IMETHOD Destroy(void);
-    // nsIScrollBar implementation
-    NS_IMETHOD SetMaxRange(PRUint32 aEndRange);
-    NS_IMETHOD GetMaxRange(PRUint32& aMaxRange);
-    NS_IMETHOD SetPosition(PRUint32 aPos);
-    NS_IMETHOD GetPosition(PRUint32& aPos);
-    NS_IMETHOD SetThumbSize(PRUint32 aSize);
-    NS_IMETHOD GetThumbSize(PRUint32& aSize);
-    NS_IMETHOD SetLineIncrement(PRUint32 aSize);
-    NS_IMETHOD GetLineIncrement(PRUint32& aSize);
-    NS_IMETHOD SetParameters(PRUint32 aMaxRange, PRUint32 aThumbSize,
-                               PRUint32 aPosition, PRUint32 aLineIncrement);
-
-    virtual PRBool    OnPaint(nsRect &r);
-	virtual PRBool    OnScroll();
-    virtual PRBool    OnResize(nsRect &aWindowRect);
-    NS_IMETHOD        GetBounds(nsRect &aRect);
-
-protected:
-	nsScrollbarBeOS	*mScrollbar;
-	BView		*CreateBeOSView();
-    int			mLineIncrement;
-    float		mScaleFactor;
-	int32		thumb;
-	orientation	mOrientation;
-};
-
-class nsScrollbarBeOS : public BScrollBar, public nsIWidgetStore
-{
-  bool first;
-  float		sbpos;
-  bool		sbposchanged;
-
-  public:
-    nsScrollbarBeOS( nsIWidget *aWidgetWindow, BRect aFrame, const char *aName,
-        BView *aTarget, float aMin, float aMax, orientation aOrientation );
-	void	ValueChanged(float newValue);
-	bool	GetPosition(int32 &p);
-};
-
-#endif // nsButton_h__

widget/src/beos/nsTextWidget.cpp

@@ -54,10 +54,6 @@ static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
 static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID);
 
 
-NS_IMPL_ADDREF(nsTextWidget)
-NS_IMPL_RELEASE(nsTextWidget)
-
-
 //-------------------------------------------------------------------------
 //
 // nsTextWidget constructor

widget/src/beos/nsTextWidget.h

@@ -60,8 +60,6 @@ public:
 
     // nsISupports
     NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);                           
-    NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
-    NS_IMETHOD_(nsrefcnt) Release(void);          
 
     virtual PRBool  OnPaint(nsRect &r);
     virtual PRBool  OnMove(PRInt32 aX, PRInt32 aY);

widget/src/beos/nsToolkit.cpp

@@ -54,7 +54,7 @@ static PRUintn gToolkitTLSIndex = 0;
 // nsISupports implementation macro
 //
 //-------------------------------------------------------------------------
-NS_IMPL_ISUPPORTS1(nsToolkit, nsIToolkit)
+NS_IMPL_THREADSAFE_ISUPPORTS1(nsToolkit, nsIToolkit)
 
 struct ThreadInterfaceData
 {

widget/src/beos/nsWindow.cpp

@@ -74,6 +74,10 @@
 #include "nsIRollupListener.h"
 #include "nsIMenuRollup.h"
 
+// See comments in nsWindow.h as to why we override these calls from nsBaseWidget
+NS_IMPL_THREADSAFE_ADDREF(nsWindow)
+NS_IMPL_THREADSAFE_RELEASE(nsWindow)
+
 ////////////////////////////////////////////////////
 // Rollup Listener - static variable defintions
 ////////////////////////////////////////////////////

widget/src/beos/nsWindow.h

@@ -79,6 +79,15 @@ public:
 	nsWindow();
 	virtual ~nsWindow();
 
+	// In BeOS, each window runs in its own thread.  Because of this,
+	// we have a proxy layer between the mozilla UI thread, and calls made
+	// within the window's thread via CallMethod().  However, since the windows
+	// are still running in their own thread, and reference counting takes place within
+	// that thread, we need to reference and de-reference outselves atomically.
+	// See BugZilla Bug# 92793
+	NS_IMETHOD_(nsrefcnt) AddRef(void);                                       
+	NS_IMETHOD_(nsrefcnt) Release(void);          
+
 	// nsIWidget interface
 	NS_IMETHOD              Create(nsIWidget *aParent,
 	                               const nsRect &aRect,