Bommels05/Mozilla
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 
git-svn-id: svn://10.0.0.236/trunk@184129 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
roc+%cs.cmu.edu
2005-11-04 02:38:33 +00:00
parent 62e6e2676d
commit c4e0410c6e
55 changed files with 625 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mozilla/layout/forms/nsGfxButtonControlFrame.cpp
View File

@@ -66,19 +66,10 @@ nsGfxButtonControlFrame::nsGfxButtonControlFrame()
mSuggestedHeight = kSuggestedNotSet;
}
nsresult
NS_NewGfxButtonControlFrame(nsIPresShell* aPresShell, nsIFrame** aNewFrame)
nsIFrame*
NS_NewGfxButtonControlFrame(nsIPresShell* aPresShell)
{
NS_PRECONDITION(aNewFrame, "null OUT ptr");
if (nsnull == aNewFrame) {
return NS_ERROR_NULL_POINTER;
}
nsGfxButtonControlFrame* it = new (aPresShell) nsGfxButtonControlFrame;
if (!it) {
return NS_ERROR_OUT_OF_MEMORY;
}
*aNewFrame = it;
return NS_OK;
return new (aPresShell) nsGfxButtonControlFrame;
}
nsIAtom*
@@ -221,9 +212,11 @@ nsGfxButtonControlFrame::CreateFrameFor(nsPresContext* aPresContext,
nsIFrame * parentFrame = mFrames.FirstChild();
nsStyleContext* styleContext = parentFrame->GetStyleContext();
rv = NS_NewTextFrame(aPresContext->PresShell(), &newFrame);
if (NS_FAILED(rv)) { return rv; }
if (!newFrame) { return NS_ERROR_NULL_POINTER; }
newFrame = NS_NewTextFrame(aPresContext->PresShell());
if (NS_UNLIKELY(!newFrame)) {
return NS_ERROR_OUT_OF_MEMORY;
}
nsRefPtr<nsStyleContext> textStyleContext;
textStyleContext = aPresContext->StyleSet()->
ResolveStyleForNonElement(styleContext);