Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Now that the ELM bug has been fixed, pull out the kungFuDeathGrips. Also make the browser chrome a strong ref so we can still hide the tooltip when the window is closed with one up. r=saari/a=sfraser.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@85351 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pinkerton%netscape.com
2001-01-23 04:41:17 +00:00
parent ecea8a7893
commit d4e8ce7976
2 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp
View File

@@ -650,7 +650,6 @@ ChromeListener :: ChromeListener ( nsWebBrowser* inBrowser, nsIWebBrowserChrome*
//
ChromeListener :: ~ChromeListener ( )
{
RemoveChromeListeners();
} // dtor
@@ -760,17 +759,14 @@ ChromeListener :: AddTooltipListener()
NS_IMETHODIMP
ChromeListener :: RemoveChromeListeners ( )
{
HideTooltip();
if ( mContextMenuListenerInstalled )
RemoveContextMenuListener();
if ( mTooltipListenerInstalled )
RemoveTooltipListener();
// because of a bug in the EventListenerManager with listeners registered to multiple
// IID's, we might not have release all refs when removing the listeners. Clearing
// our ref to the listener will free them, but use a deathgrip to make sure we don't
// go away until we're truly ready.
nsCOMPtr<nsIDOMMouseListener> kungFuDeathGrip ( this );
mEventReceiver = nsnull;
// it really doesn't matter if these fail...
@@ -789,9 +785,6 @@ NS_IMETHODIMP
ChromeListener :: RemoveContextMenuListener()
{
if (mEventReceiver) {
// Removing the mouse listener may cause this instance to
// be deleted... So, keep an extra reference to defer destruction..
nsCOMPtr<nsIDOMMouseListener> kungFuDeathGrip(this);
nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this);
nsresult rv = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener));
if (NS_SUCCEEDED(rv))
@@ -811,9 +804,6 @@ NS_IMETHODIMP
ChromeListener :: RemoveTooltipListener()
{
if (mEventReceiver) {
// Removing the mouse listener may cause this instance to
// be deleted... So, keep an extra reference to defer destruction..
nsCOMPtr<nsIDOMMouseListener> kungFuDeathGrip(this);
nsIDOMMouseListener *pListener = NS_STATIC_CAST(nsIDOMMouseListener *, this);
nsresult rv = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseListener));
nsresult rv2 = mEventReceiver->RemoveEventListenerByIID(pListener, NS_GET_IID(nsIDOMMouseMotionListener));