corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 313817. DeCOMtaminate more NS_New*Frame functions. r+sr=roc, patch by Marc Liddell

Browse Source
This commit is contained in:
roc+@cs.cmu.edu
2005-11-01 20:40:54 +00:00
parent f9c7739d8c
commit 96e9963c67
17 changed files with 121 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
layout/generic/nsFrameSetFrame.cpp
View File

@@ -408,9 +408,9 @@ nsHTMLFramesetFrame::Init(nsPresContext* aPresContext,
kidSC = shell->StyleSet()->ResolveStyleFor(child, mStyleContext);
if (tag == nsHTMLAtoms::frameset) {
result = NS_NewHTMLFramesetFrame(shell, &frame);
if (NS_FAILED(result))
return result;
frame = NS_NewHTMLFramesetFrame(shell);
if (NS_UNLIKELY(!frame))
return NS_ERROR_OUT_OF_MEMORY;
mChildTypes[mChildCount] = FRAMESET;
nsHTMLFramesetFrame* childFrame = (nsHTMLFramesetFrame*)frame;
@@ -1571,19 +1571,10 @@ nsHTMLFramesetFrame::EndMouseDrag(nsPresContext* aPresContext)
gDragInProgress = PR_FALSE;
}
nsresult
NS_NewHTMLFramesetFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
nsIFrame*
NS_NewHTMLFramesetFrame(nsIPresShell* aPresShell)
{
NS_PRECONDITION(aNewFrame, "null OUT ptr");
if (nsnull == aNewFrame) {
return NS_ERROR_NULL_POINTER;
}
nsHTMLFramesetFrame* it = new (aPresShell) nsHTMLFramesetFrame;
if (!it) {
return NS_ERROR_OUT_OF_MEMORY;
}
*aNewFrame = it;
return NS_OK;
return new (aPresShell) nsHTMLFramesetFrame;
}
/*******************************************************************************