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

Fix for bug 24306. The DocumentViewer now cleans up dangling webshell references in the PresContext. nsGenericElement::TriggerLink deals with a nonexistent handler (it might have been deleted already as part of event processing). r=buster, joki

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@59566 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
vidur%netscape.com
2000-02-02 23:40:22 +00:00
parent a128731cb0
commit 09a857de06
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mozilla/content/base/src/nsDocumentViewer.cpp
View File

@@ -325,6 +325,11 @@ DocumentViewerImpl::~DocumentViewerImpl()
mDocument->SetScriptGlobalObject(nsnull);
}
if (mPresContext) {
mPresContext->SetContainer(nsnull);
mPresContext->SetLinkHandler(nsnull);
}
if (mDeviceContext)
mDeviceContext->FlushFontCache();

5
mozilla/content/base/src/nsGenericElement.cpp
View File

@@ -1275,9 +1275,8 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
{
nsCOMPtr<nsILinkHandler> handler;
nsresult rv = aPresContext->GetLinkHandler(getter_AddRefs(handler));
if (NS_FAILED(rv)) return rv;
if (!handler) return NS_ERROR_UNEXPECTED; // this can happen in editor windows
if (NS_FAILED(rv) || (nsnull == handler)) return rv;
// Resolve url to an absolute url
nsAutoString absURLSpec;
if (nsnull != aBaseURL) {

5
mozilla/layout/base/nsDocumentViewer.cpp
View File

@@ -325,6 +325,11 @@ DocumentViewerImpl::~DocumentViewerImpl()
mDocument->SetScriptGlobalObject(nsnull);
}
if (mPresContext) {
mPresContext->SetContainer(nsnull);
mPresContext->SetLinkHandler(nsnull);
}
if (mDeviceContext)
mDeviceContext->FlushFontCache();

5
mozilla/layout/base/src/nsDocumentViewer.cpp
View File

@@ -325,6 +325,11 @@ DocumentViewerImpl::~DocumentViewerImpl()
mDocument->SetScriptGlobalObject(nsnull);
}
if (mPresContext) {
mPresContext->SetContainer(nsnull);
mPresContext->SetLinkHandler(nsnull);
}
if (mDeviceContext)
mDeviceContext->FlushFontCache();

5
mozilla/layout/base/src/nsGenericElement.cpp
View File

@@ -1275,9 +1275,8 @@ nsGenericElement::TriggerLink(nsIPresContext* aPresContext,
{
nsCOMPtr<nsILinkHandler> handler;
nsresult rv = aPresContext->GetLinkHandler(getter_AddRefs(handler));
if (NS_FAILED(rv)) return rv;
if (!handler) return NS_ERROR_UNEXPECTED; // this can happen in editor windows
if (NS_FAILED(rv) || (nsnull == handler)) return rv;
// Resolve url to an absolute url
nsAutoString absURLSpec;
if (nsnull != aBaseURL) {