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

Move logic in nsHTMLFrameInnerFrame's destroy to nsHTMLFrameInnerFrame:Destroy so its contents are destroyed *before* nsHTMLFrameInnerFrame is destroyed. bug=66748 r=jkeiser@netscape.com sr=attinasi@netscape.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@121235 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kmcclusk%netscape.com
2002-05-10 01:25:41 +00:00
parent 3fb55d2380
commit 636f37816d
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mozilla/layout/generic/nsFrameFrame.cpp
View File

@@ -210,6 +210,8 @@ public:
NS_IMETHOD GetFrameType(nsIAtom** aType) const;
NS_IMETHOD Destroy(nsIPresContext* aPresContext);
/**
* @see nsIFrame::Paint
*/
@@ -254,8 +256,6 @@ protected:
nsresult CreateViewAndWidget(nsIPresContext* aPresContext,
nsIWidget** aWidget);
virtual ~nsHTMLFrameInnerFrame();
virtual void GetDesiredSize(nsIPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsHTMLReflowMetrics& aDesiredSize);
@@ -693,7 +693,8 @@ nsHTMLFrameInnerFrame::nsHTMLFrameInnerFrame()
{
}
nsHTMLFrameInnerFrame::~nsHTMLFrameInnerFrame()
NS_IMETHODIMP
nsHTMLFrameInnerFrame::Destroy(nsIPresContext* aPresContext)
{
if (mFrameLoader) {
// Get the content viewer through the docshell, but don't call
@@ -721,6 +722,8 @@ nsHTMLFrameInnerFrame::~nsHTMLFrameInnerFrame()
mFrameLoader->Destroy();
}
return nsLeafFrame::Destroy(aPresContext);
}
PRBool nsHTMLFrameInnerFrame::GetURL(nsIContent* aContent, nsString& aResult)

9
mozilla/layout/html/document/src/nsFrameFrame.cpp
View File

@@ -210,6 +210,8 @@ public:
NS_IMETHOD GetFrameType(nsIAtom** aType) const;
NS_IMETHOD Destroy(nsIPresContext* aPresContext);
/**
* @see nsIFrame::Paint
*/
@@ -254,8 +256,6 @@ protected:
nsresult CreateViewAndWidget(nsIPresContext* aPresContext,
nsIWidget** aWidget);
virtual ~nsHTMLFrameInnerFrame();
virtual void GetDesiredSize(nsIPresContext* aPresContext,
const nsHTMLReflowState& aReflowState,
nsHTMLReflowMetrics& aDesiredSize);
@@ -693,7 +693,8 @@ nsHTMLFrameInnerFrame::nsHTMLFrameInnerFrame()
{
}
nsHTMLFrameInnerFrame::~nsHTMLFrameInnerFrame()
NS_IMETHODIMP
nsHTMLFrameInnerFrame::Destroy(nsIPresContext* aPresContext)
{
if (mFrameLoader) {
// Get the content viewer through the docshell, but don't call
@@ -721,6 +722,8 @@ nsHTMLFrameInnerFrame::~nsHTMLFrameInnerFrame()
mFrameLoader->Destroy();
}
return nsLeafFrame::Destroy(aPresContext);
}
PRBool nsHTMLFrameInnerFrame::GetURL(nsIContent* aContent, nsString& aResult)