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

Fixing crasher bug 138138. Clear the box object table in xul documents when a xul document is hidden since the box object table may contain references to non-refcounted frames that will be destroyed when the document is hidden. r=jkeiser@netscape.com, sr=heikki@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2002-04-18 19:50:31 +00:00
parent ee8ba26ef6
commit ea45ab47a7
5 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
content/base/src/nsDocumentViewer.cpp
View File

@ -2061,6 +2061,12 @@ DocumentViewerImpl::Hide(void)
if (selPrivate && mSelectionListener) if (selPrivate && mSelectionListener)
selPrivate->RemoveSelectionListener(mSelectionListener); selPrivate->RemoveSelectionListener(mSelectionListener);
nsCOMPtr<nsIXULDocument> xul_doc(do_QueryInterface(mDocument));
if (xul_doc) {
xul_doc->ClearBoxObjectTable();
}
mPresShell->Destroy(); mPresShell->Destroy();
mPresShell = nsnull; mPresShell = nsnull;
@ -2080,7 +2086,8 @@ DocumentViewerImpl::Hide(void)
} }
nsresult nsresult
DocumentViewerImpl::FindFrameSetWithIID(nsIContent * aParentContent, const nsIID& aIID) DocumentViewerImpl::FindFrameSetWithIID(nsIContent * aParentContent,
const nsIID& aIID)
{ {
PRInt32 numChildren; PRInt32 numChildren;
aParentContent->ChildCount(numChildren); aParentContent->ChildCount(numChildren);

7
content/xul/document/public/nsIXULDocument.h
View File

@ -78,7 +78,7 @@ class nsIXULPrototypeDocument;
class nsIXULDocument : public nsIXMLDocument class nsIXULDocument : public nsIXMLDocument
{ {
public: public:
static const nsIID& GetIID() { static nsIID iid = NS_IRDFDOCUMENT_IID; return iid; } NS_DEFINE_STATIC_IID_ACCESSOR(NS_IRDFDOCUMENT_IID)
// The resource-to-element map is a one-to-many mapping of RDF // The resource-to-element map is a one-to-many mapping of RDF
// resources to content elements. // resources to content elements.
@ -165,6 +165,11 @@ public:
* Callback from the content sink upon resumption from the parser. * Callback from the content sink upon resumption from the parser.
*/ */
NS_IMETHOD OnResumeContentSink() = 0; NS_IMETHOD OnResumeContentSink() = 0;
/**
* Clear the box object hash
*/
NS_IMETHOD ClearBoxObjectTable() = 0;
}; };
// factory functions // factory functions

9
content/xul/document/src/nsXULDocument.cpp
View File

@ -1843,6 +1843,15 @@ nsXULDocument::OnResumeContentSink()
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP
nsXULDocument::ClearBoxObjectTable()
{
delete mBoxObjectTable;
mBoxObjectTable = nsnull;
return NS_OK;
}
static void PR_CALLBACK static void PR_CALLBACK
ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry) ClearBroadcasterMapEntry(PLDHashTable* aTable, PLDHashEntryHdr* aEntry)
{ {

3
content/xul/document/src/nsXULDocument.h
View File

@ -369,7 +369,8 @@ public:
NS_IMETHOD GetTemplateBuilderFor(nsIContent* aContent, nsIXULTemplateBuilder** aResult); NS_IMETHOD GetTemplateBuilderFor(nsIContent* aContent, nsIXULTemplateBuilder** aResult);
NS_IMETHOD OnPrototypeLoadDone(); NS_IMETHOD OnPrototypeLoadDone();
NS_IMETHOD OnResumeContentSink(); NS_IMETHOD OnResumeContentSink();
NS_IMETHOD ClearBoxObjectTable();
// nsIDOMEventCapturer interface // nsIDOMEventCapturer interface
NS_IMETHOD CaptureEvent(const nsAString& aType); NS_IMETHOD CaptureEvent(const nsAString& aType);
NS_IMETHOD ReleaseEvent(const nsAString& aType); NS_IMETHOD ReleaseEvent(const nsAString& aType);

9
layout/base/nsDocumentViewer.cpp
View File

@ -2061,6 +2061,12 @@ DocumentViewerImpl::Hide(void)
if (selPrivate && mSelectionListener) if (selPrivate && mSelectionListener)
selPrivate->RemoveSelectionListener(mSelectionListener); selPrivate->RemoveSelectionListener(mSelectionListener);
nsCOMPtr<nsIXULDocument> xul_doc(do_QueryInterface(mDocument));
if (xul_doc) {
xul_doc->ClearBoxObjectTable();
}
mPresShell->Destroy(); mPresShell->Destroy();
mPresShell = nsnull; mPresShell = nsnull;
@ -2080,7 +2086,8 @@ DocumentViewerImpl::Hide(void)
} }
nsresult nsresult
DocumentViewerImpl::FindFrameSetWithIID(nsIContent * aParentContent, const nsIID& aIID) DocumentViewerImpl::FindFrameSetWithIID(nsIContent * aParentContent,
const nsIID& aIID)
{ {
PRInt32 numChildren; PRInt32 numChildren;
aParentContent->ChildCount(numChildren); aParentContent->ChildCount(numChildren);