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

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

19
mozilla/layout/forms/nsTextControlFrame.cpp
View File

@@ -1821,28 +1821,25 @@ nsTextControlFrame::GetMaxSize(nsBoxLayoutState& aState)
return nsBox::GetMaxSize(aState);
}
NS_IMETHODIMP
nsTextControlFrame::GetAscent(nsBoxLayoutState& aState, nscoord& aAscent)
nscoord
nsTextControlFrame::GetBoxAscent(nsBoxLayoutState& aState)
{
// First calculate the ascent of the text inside
nsresult rv = nsStackFrame::GetAscent(aState, aAscent);
NS_ENSURE_SUCCESS(rv, rv);
nscoord ascent = nsStackFrame::GetBoxAscent(aState);
// Now adjust the ascent for our borders and padding
nsMargin borderPadding;
GetBorderAndPadding(borderPadding);
aAscent += borderPadding.top;
ascent += borderPadding.top;
return NS_OK;
return ascent;
}
NS_IMETHODIMP
nsTextControlFrame::IsCollapsed(nsBoxLayoutState& aBoxLayoutState,
PRBool& aCollapsed)
PRBool
nsTextControlFrame::IsCollapsed(nsBoxLayoutState& aBoxLayoutState)
{
// We're never collapsed in the box sense.
aCollapsed = PR_FALSE;
return NS_OK;
return PR_FALSE;
}
PRBool