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

Reworked frame factory methods; fixed bug 4519

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@31154 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1999-05-11 22:03:29 +00:00
parent 126ac23d41
commit de60169b67
142 changed files with 1298 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -428,13 +428,17 @@ nsHTMLFrameOuterFrame::AttributeChanged(nsIPresContext* aPresContext,
}
nsresult
NS_NewHTMLFrameOuterFrame(nsIFrame*& aResult)
NS_NewHTMLFrameOuterFrame(nsIFrame** aNewFrame)
{
nsIFrame* frame = new nsHTMLFrameOuterFrame;
if (nsnull == frame) {
NS_PRECONDITION(aNewFrame, "null OUT ptr");
if (nsnull == aNewFrame) {
return NS_ERROR_NULL_POINTER;
}
nsHTMLFrameOuterFrame* it = new nsHTMLFrameOuterFrame;
if (!it) {
return NS_ERROR_OUT_OF_MEMORY;
}
aResult = frame;
*aNewFrame = it;
return NS_OK;
}

16
mozilla/layout/html/document/src/nsFrameSetFrame.cpp
View File

@@ -1006,7 +1006,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
aPresContext.ResolveStyleContextFor(child, mStyleContext,
PR_FALSE, &kidSC);
if (nsHTMLAtoms::frameset == tag) {
result = NS_NewHTMLFramesetFrame(frame);
result = NS_NewHTMLFramesetFrame(&frame);
frame->Init(aPresContext, child, this, kidSC, nsnull);
childTypes[mChildCount] = FRAMESET;
@@ -1016,7 +1016,7 @@ nsHTMLFramesetFrame::Reflow(nsIPresContext& aPresContext,
childFrame->SetParentBorderColor(borderColor);
childBorderColors[mChildCount].Set(childFrame->GetBorderColor());
} else { // frame
result = NS_NewHTMLFrameOuterFrame(frame);
result = NS_NewHTMLFrameOuterFrame(&frame);
frame->Init(aPresContext, child, this, kidSC, nsnull);
childTypes[mChildCount] = FRAME;
@@ -1510,13 +1510,17 @@ nsHTMLFramesetFrame::EndMouseDrag()
}
nsresult
NS_NewHTMLFramesetFrame(nsIFrame*& aResult)
NS_NewHTMLFramesetFrame(nsIFrame** aNewFrame)
{
nsIFrame* frame = new nsHTMLFramesetFrame;
if (nsnull == frame) {
NS_PRECONDITION(aNewFrame, "null OUT ptr");
if (nsnull == aNewFrame) {
return NS_ERROR_NULL_POINTER;
}
nsHTMLFramesetFrame* it = new nsHTMLFramesetFrame;
if (!it) {
return NS_ERROR_OUT_OF_MEMORY;
}
aResult = frame;
*aNewFrame = it;
return NS_OK;
}