made sure "average" was initialized to zero
change the setting of the font from mFixedFont to mFont for textfields b=18232,32254 r=sfraserfor 18232, self for 32254 git-svn-id: svn://10.0.0.236/trunk@63399 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -247,7 +247,7 @@ nsFormControlHelper::CalcNavQuirkSizing(nsIPresContext* aPresContext,
|
||||
nscoord width;
|
||||
nscoord hgt;
|
||||
nscoord height;
|
||||
nscoord average;
|
||||
nscoord average = 0;
|
||||
if ((NS_FORM_INPUT_TEXT == type) || (NS_FORM_INPUT_PASSWORD == type)) {
|
||||
average = (char1Width + char2Width) / 2;
|
||||
width = maxCharWidth;
|
||||
@@ -619,7 +619,7 @@ nsFormControlHelper::GetFont(nsIFormControlFrame * aFormFrame,
|
||||
case NS_FORM_INPUT_TEXT:
|
||||
case NS_FORM_TEXTAREA:
|
||||
case NS_FORM_INPUT_PASSWORD:
|
||||
aFont = &styleFont->mFixedFont;
|
||||
aFont = &styleFont->mFont;
|
||||
break;
|
||||
case NS_FORM_INPUT_BUTTON:
|
||||
case NS_FORM_INPUT_SUBMIT:
|
||||
|
||||
Reference in New Issue
Block a user