Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 21:35:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed shoddy reference counting in FindBrowserFor(), and changed

Browse Source 
Destroy() to release references on six widgets
This commit is contained in:
troy%netscape.com 1998-08-06 02:21:23 +00:00
parent 7c7f52211e
commit 2ba08bde69
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
webshell/tests/viewer/nsBrowserWindow.cpp
View File

@ -126,7 +126,8 @@ nsVoidArray nsBrowserWindow::gBrowsers;
nsBrowserWindow* nsBrowserWindow*
nsBrowserWindow::FindBrowserFor(nsIWidget* aWidget, PRIntn aWhich) nsBrowserWindow::FindBrowserFor(nsIWidget* aWidget, PRIntn aWhich)
{ {
nsIWidget* widget; nsIWidget* widget;
nsBrowserWindow* result = nsnull;
PRInt32 i, n = gBrowsers.Count(); PRInt32 i, n = gBrowsers.Count();
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
@ -135,24 +136,36 @@ nsBrowserWindow::FindBrowserFor(nsIWidget* aWidget, PRIntn aWhich)
switch (aWhich) { switch (aWhich) {
case FIND_WINDOW: case FIND_WINDOW:
bw->mWindow->QueryInterface(kIWidgetIID, (void**) &widget); bw->mWindow->QueryInterface(kIWidgetIID, (void**) &widget);
if (widget == aWidget) return bw; if (widget == aWidget) {
result = bw;
}
NS_IF_RELEASE(widget);
break; break;
case FIND_BACK: case FIND_BACK:
bw->mBack->QueryInterface(kIWidgetIID, (void**) &widget); bw->mBack->QueryInterface(kIWidgetIID, (void**) &widget);
if (widget == aWidget) return bw; if (widget == aWidget) {
result = bw;
}
NS_IF_RELEASE(widget);
break; break;
case FIND_FORWARD: case FIND_FORWARD:
bw->mForward->QueryInterface(kIWidgetIID, (void**) &widget); bw->mForward->QueryInterface(kIWidgetIID, (void**) &widget);
if (widget == aWidget) return bw; if (widget == aWidget) {
result = bw;
}
NS_IF_RELEASE(widget);
break; break;
case FIND_LOCATION: case FIND_LOCATION:
bw->mLocation->QueryInterface(kIWidgetIID, (void**) &widget); bw->mLocation->QueryInterface(kIWidgetIID, (void**) &widget);
if (widget == aWidget) return bw; if (widget == aWidget) {
result = bw;
}
NS_IF_RELEASE(widget);
break; break;
} }
} }
} }
return nsnull; return result;
} }
void void
@ -331,11 +344,12 @@ nsBrowserWindow::Destroy()
NS_RELEASE(mWebShell); NS_RELEASE(mWebShell);
} }
NS_IF_RELEASE(mWindow);
NS_IF_RELEASE(mBack); NS_IF_RELEASE(mBack);
NS_IF_RELEASE(mForward); NS_IF_RELEASE(mForward);
NS_IF_RELEASE(mLocation); NS_IF_RELEASE(mLocation);
NS_IF_RELEASE(mThrobber); NS_IF_RELEASE(mThrobber);
// XXX What about releasing all the other objects... NS_IF_RELEASE(mStatus);
} }
void void