Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-12 09:01:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix scrollbar leaks by making sure that we decrement the refcnt when Destroy() is called.

Browse Source 
bug #101814 r=pavlov
This commit is contained in:
seawood%netscape.com 2001-10-13 05:50:16 +00:00
parent 0267ec416e
commit 2ae055c744
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
widget/src/beos/nsScrollbar.cpp
View File

@ -35,14 +35,22 @@
*
* ***** END LICENSE BLOCK ***** */
#include "nsISupportsUtils.h"
#include "nsWidgetsCID.h"
#include "nsScrollbar.h"
#include "nsToolkit.h"
#include "nsGUIEvent.h"
#include "nsUnitConversion.h"
//-------------------------------------------------------------------------
//
// nsISupports
//
//-------------------------------------------------------------------------
NS_IMPL_ADDREF(nsScrollbar)
NS_IMPL_RELEASE(nsScrollbar)
NS_IMPL_QUERY_INTERFACE2(nsScrollbar, nsIScrollbar, nsWindow)
//-------------------------------------------------------------------------
//
@ -54,6 +62,7 @@ nsScrollbar::nsScrollbar(PRBool aIsVertical) : nsWindow(), nsIScrollbar()
NS_INIT_REFCNT();
mOrientation = (aIsVertical) ? B_VERTICAL : B_HORIZONTAL;
mLineIncrement = 0;
mScrollbar = 0;
thumb = 0;
}
@ -69,25 +78,16 @@ nsScrollbar::~nsScrollbar()
//-------------------------------------------------------------------------
//
// Query interface implementation
//
// Handle Destroy() here so that we properly Release() the instance
// and mScrollbar is destroyed by nsWindow::Destroy even though
// mScrollbar is non-zero after the call
//-------------------------------------------------------------------------
nsresult nsScrollbar::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
nsresult result = nsWindow::QueryInterface(aIID, aInstancePtr);
static NS_DEFINE_IID(kInsScrollbarIID, NS_ISCROLLBAR_IID);
if (result == NS_NOINTERFACE && aIID.Equals(kInsScrollbarIID)) {
*aInstancePtr = (void*) ((nsIScrollbar*)this);
NS_ADDREF_THIS();
result = NS_OK;
}
return result;
NS_METHOD nsScrollbar::Destroy() {
nsWindow::Destroy();
NS_RELEASE_THIS();
return NS_OK;
}
//-------------------------------------------------------------------------
//
// Define the range settings

12
widget/src/beos/nsScrollbar.h
View File

@ -38,6 +38,7 @@
#ifndef nsScrollbar_h__
#define nsScrollbar_h__
#include "nsISupportsUtils.h"
#include "nsdefs.h"
#include "nsWindow.h"
#include "nsSwitchToUIThread.h"
@ -49,22 +50,21 @@
class nsScrollbarBeOS;
/**
* Native WIN32 scrollbar wrapper.
* Native BeOS scrollbar wrapper.
*/
class nsScrollbar : public nsWindow,
public nsIScrollbar
{
// nsISupports
NS_DECL_ISUPPORTS
public:
nsScrollbar(PRBool aIsVertical);
virtual ~nsScrollbar();
// nsISupports
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
NS_IMETHOD_(nsrefcnt) AddRef(void);
NS_IMETHOD_(nsrefcnt) Release(void);
NS_IMETHOD Destroy(void);
// nsIScrollBar implementation
NS_IMETHOD SetMaxRange(PRUint32 aEndRange);
NS_IMETHOD GetMaxRange(PRUint32& aMaxRange);