Backout of commits for bug 97299. This causes assertions, which means we
missed some spots where name was getting set. git-svn-id: svn://10.0.0.236/trunk@103624 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -628,13 +628,13 @@ nsFormControlHelper::GetFont(nsIFormControlFrame * aFormFrame,
|
||||
aFont.weight = NS_FONT_WEIGHT_NORMAL; // always normal weight
|
||||
aFont.size = styleFont->mFont.size; // normal font size
|
||||
if (0 == (styleFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT)) {
|
||||
aFont.name = "arial"; // XXX windows specific font
|
||||
aFont.name = "Arial"; // XXX windows specific font
|
||||
}
|
||||
} else {
|
||||
// use arial, scaled down one HTML size
|
||||
// italics, decoration & variant(?) get used
|
||||
aFont = styleFont->mFont;
|
||||
aFont.name = "arial"; // XXX windows specific font
|
||||
aFont.name = "Arial"; // XXX windows specific font
|
||||
aFont.weight = NS_FONT_WEIGHT_NORMAL;
|
||||
const nsFont& normal = aPresContext->GetDefaultFontDeprecated();
|
||||
PRInt32 scaler;
|
||||
|
||||
Reference in New Issue
Block a user