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

fixing crasher, reference counting problems. r=ccarlen

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@77712 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
beard%netscape.com
2000-08-31 02:26:44 +00:00
parent e1f404e151
commit 66669e3f04
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/webshell/tests/viewer/nsBrowserWindow.cpp
View File

@@ -250,7 +250,8 @@ NS_IMETHODIMP nsBrowserWindow::Destroy()
docLoader->RemoveObserver(this);
nsCOMPtr<nsIBaseWindow> docShellWin(do_QueryInterface(mDocShell));
docShellWin->Destroy();
NS_RELEASE(mDocShell);
mDocShell = nsnull;
// NS_RELEASE(mDocShell);
}
nsrefcnt refCnt;
@@ -271,7 +272,8 @@ NS_IMETHODIMP nsBrowserWindow::Destroy()
// Others are holding refs to this,
// but it gets released OK.
DestroyWidget(mWindow);
NS_RELEASE(mWindow);
mWindow = nsnull;
// NS_RELEASE(mWindow);
return NS_OK;
}
@@ -1400,7 +1402,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
// Create top level window
nsresult rv = nsComponentManager::CreateInstance(kWindowCID, nsnull,
kIWidgetIID,
(void**)&mWindow);
getter_AddRefs(mWindow));
if (NS_OK != rv) {
return rv;
}
@@ -1424,8 +1426,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
mWebBrowser->SetContainerWindow(mWebBrowserChrome);
webBrowserWin->Create();
nsCOMPtr<nsIDocShell> docShell = do_GetInterface(mWebBrowser);
mDocShell = docShell;
mDocShell = do_GetInterface(mWebBrowser);
mDocShell->SetAllowPlugins(aAllowPlugins);
nsCOMPtr<nsIDocumentLoader> docLoader;
nsCOMPtr<nsIWebShell> webShell(do_QueryInterface(mDocShell));
@@ -1485,7 +1486,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
// Create top level window
nsresult rv = nsComponentManager::CreateInstance(kWindowCID, nsnull,
kIWidgetIID,
(void**)&mWindow);
getter_AddRefs(mWindow));
if (NS_OK != rv) {
return rv;
}
@@ -1497,7 +1498,7 @@ nsBrowserWindow::Init(nsIAppShell* aAppShell,
// Create web shell
rv = nsComponentManager::CreateInstance(kWebShellCID, nsnull,
NS_GET_IID(nsIDocShell),
(void**)&mDocShell);
getter_AddRefs(mDocShell));
if (NS_OK != rv) {
return rv;
}

4
mozilla/webshell/tests/viewer/nsBrowserWindow.h
View File

@@ -227,8 +227,8 @@ public:
PRUint32 mChromeMask;
nsString mTitle;
nsIWidget* mWindow;
nsIDocShell* mDocShell;
nsCOMPtr<nsIWidget> mWindow;
nsCOMPtr<nsIDocShell> mDocShell;
nsCOMPtr<nsIWebBrowser> mWebBrowser;
nsFileSpec mOpenFileDirectory;