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

Bug 18067. Event listeners are refcounted; do not try to manually 'delete'. r=hyatt, a=chofmann.

Browse Source
This commit is contained in:
waterson%netscape.com 1999-11-09 23:37:57 +00:00
parent 819d8c8c97
commit c20b3997b4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
layout/xul/base/src/nsMenuBarFrame.cpp
View File

@ -115,19 +115,21 @@ nsMenuBarFrame::Init(nsIPresContext& aPresContext,
// Create the menu bar listener.
mMenuBarListener = new nsMenuBarListener(this);
if (! mMenuBarListener)
return NS_ERROR_OUT_OF_MEMORY;
// Hook up the menu bar as a key listener (capturer) on the whole document. It will see every
// key press that occurs before anyone else does and will know when to take control.
nsCOMPtr<nsIDocument> doc;
aContent->GetDocument(*getter_AddRefs(doc));
nsCOMPtr<nsIDOMEventReceiver> target = do_QueryInterface(doc);
nsIDOMEventListener* domEventListener = (nsIDOMKeyListener*)mMenuBarListener;
mTarget = target;
target->AddEventListener("keypress", domEventListener, PR_TRUE);
target->AddEventListener("keydown", domEventListener, PR_TRUE);
target->AddEventListener("keyup", domEventListener, PR_TRUE);
target->AddEventListener("keypress", mMenuBarListener, PR_TRUE);
target->AddEventListener("keydown", mMenuBarListener, PR_TRUE);
target->AddEventListener("keyup", mMenuBarListener, PR_TRUE);
NS_ADDREF(mMenuBarListener);
return rv;
}
@ -534,8 +536,7 @@ nsMenuBarFrame::Destroy(nsIPresContext& aPresContext)
mTarget->RemoveEventListener("keydown", mMenuBarListener, PR_TRUE);
mTarget->RemoveEventListener("keyup", mMenuBarListener, PR_TRUE);
delete mMenuBarListener;
mMenuBarListener = nsnull;
NS_IF_RELEASE(mMenuBarListener);
return nsToolbarFrame::Destroy(aPresContext);
}