Cleanup font usage in form input controls, b=251637, r=jshin, sr=bzbarsky
git-svn-id: svn://10.0.0.236/trunk@159562 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -1281,7 +1281,7 @@ nsListControlFrame::Reflow(nsIPresContext* aPresContext,
|
||||
if (visibleHeight == 0) {
|
||||
if (aReflowState.mComputedHeight != 0) {
|
||||
nsCOMPtr<nsIFontMetrics> fontMet;
|
||||
nsresult rvv = nsFormControlHelper::GetFrameFontFM(aPresContext, this, getter_AddRefs(fontMet));
|
||||
nsresult rvv = nsFormControlHelper::GetFrameFontFM(this, getter_AddRefs(fontMet));
|
||||
if (NS_SUCCEEDED(rvv) && fontMet) {
|
||||
aReflowState.rendContext->SetFont(fontMet);
|
||||
fontMet->GetHeight(visibleHeight);
|
||||
@@ -1416,15 +1416,6 @@ nsListControlFrame::GetScrollbarStyles() const
|
||||
verticalStyle);
|
||||
}
|
||||
|
||||
//---------------------------------------------------------
|
||||
NS_IMETHODIMP
|
||||
nsListControlFrame::GetFont(nsIPresContext* aPresContext,
|
||||
const nsFont*& aFont)
|
||||
{
|
||||
return nsFormControlHelper::GetFont(this, aPresContext, mStyleContext, aFont);
|
||||
}
|
||||
|
||||
|
||||
//---------------------------------------------------------
|
||||
PRBool
|
||||
nsListControlFrame::IsOptionElement(nsIContent* aContent)
|
||||
|
||||
Reference in New Issue
Block a user