corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

375196, r+sr=roc

Browse Source
This commit is contained in:
2007-03-25 22:38:22 -07:00
parent 0b82d5b70f
commit 7e4e3ec68f
12 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
layout/xul/base/src/nsMenuFrame.cpp
View File

@@ -1726,7 +1726,7 @@ nsMenuFrame::OnCreate()
nsresult rv = NS_OK;
nsIPresShell *shell = GetPresContext()->GetPresShell();
nsCOMPtr<nsIPresShell> shell = GetPresContext()->GetPresShell();
if (shell) {
if (child) {
rv = shell->HandleDOMEventWithTarget(child, &event, &status);
@@ -1734,7 +1734,6 @@ nsMenuFrame::OnCreate()
else {
rv = shell->HandleDOMEventWithTarget(mContent, &event, &status);
}
// shell may no longer be alive, don't use it here unless you keep a ref
}
if ( NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault )
@@ -1800,7 +1799,7 @@ nsMenuFrame::OnCreated()
GetMenuChildrenElement(getter_AddRefs(child));
nsresult rv = NS_OK;
nsIPresShell *shell = GetPresContext()->GetPresShell();
nsCOMPtr<nsIPresShell> shell = GetPresContext()->GetPresShell();
if (shell) {
if (child) {
rv = shell->HandleDOMEventWithTarget(child, &event, &status);
@@ -1808,7 +1807,6 @@ nsMenuFrame::OnCreated()
else {
rv = shell->HandleDOMEventWithTarget(mContent, &event, &status);
}
// shell may no longer be alive, don't use it here unless you keep a ref
}
if ( NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault )
@@ -1827,7 +1825,7 @@ nsMenuFrame::OnDestroy()
GetMenuChildrenElement(getter_AddRefs(child));
nsresult rv = NS_OK;
nsIPresShell *shell = GetPresContext()->GetPresShell();
nsCOMPtr<nsIPresShell> shell = GetPresContext()->GetPresShell();
if (shell) {
if (child) {
rv = shell->HandleDOMEventWithTarget(child, &event, &status);
@@ -1835,7 +1833,6 @@ nsMenuFrame::OnDestroy()
else {
rv = shell->HandleDOMEventWithTarget(mContent, &event, &status);
}
// shell may no longer be alive, don't use it here unless you keep a ref
}
if ( NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault )
@@ -1854,7 +1851,7 @@ nsMenuFrame::OnDestroyed()
GetMenuChildrenElement(getter_AddRefs(child));
nsresult rv = NS_OK;
nsIPresShell *shell = GetPresContext()->GetPresShell();
nsCOMPtr<nsIPresShell> shell = GetPresContext()->GetPresShell();
if (shell) {
if (child) {
rv = shell->HandleDOMEventWithTarget(child, &event, &status);
@@ -1862,7 +1859,6 @@ nsMenuFrame::OnDestroyed()
else {
rv = shell->HandleDOMEventWithTarget(mContent, &event, &status);
}
// shell may no longer be alive, don't use it here unless you keep a ref
}
if ( NS_FAILED(rv) || status == nsEventStatus_eConsumeNoDefault )