Bug 243370, deCOMtaminate parts of nsIFrame that come from nsIBox, part 2, p=anlan@lange.cx, r+sr=roc

git-svn-id: svn://10.0.0.236/trunk@219259 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
Olli.Pettay%helsinki.fi
2007-01-31 16:02:42 +00:00
parent 8da4e21793
commit ba610d02ec
34 changed files with 251 additions and 549 deletions

View File

@@ -1041,23 +1041,22 @@ nsXULScrollFrame::GetType() const
return nsGkAtoms::scrollFrame;
}
NS_IMETHODIMP
nsXULScrollFrame::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent)
nscoord
nsXULScrollFrame::GetBoxAscent(nsBoxLayoutState& aState)
{
aAscent = 0;
if (!mInner.mScrolledFrame)
return NS_OK;
return 0;
nsresult rv = mInner.mScrolledFrame->GetAscent(aState, aAscent);
nscoord ascent = mInner.mScrolledFrame->GetBoxAscent(aState);
nsMargin m(0,0,0,0);
GetBorderAndPadding(m);
aAscent += m.top;
ascent += m.top;
GetMargin(m);
aAscent += m.top;
ascent += m.top;
GetInset(m);
aAscent += m.top;
ascent += m.top;
return rv;
return ascent;
}
nsSize