From d3fb79a11adb7875e3cc273df10e4fd33cc4ec97 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Wed, 16 May 2007 21:17:21 +0000 Subject: [PATCH] Revert part of bug 377521 to fix bug 380825 (and add comment). r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@226545 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/style/nsRuleNode.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mozilla/layout/style/nsRuleNode.cpp b/mozilla/layout/style/nsRuleNode.cpp index 5e8062177b7..b1b26e9aee2 100644 --- a/mozilla/layout/style/nsRuleNode.cpp +++ b/mozilla/layout/style/nsRuleNode.cpp @@ -2116,7 +2116,9 @@ nsRuleNode::SetFont(nsPresContext* aPresContext, nsStyleContext* aContext, zoom = PR_FALSE; } else if (eCSSUnit_Initial == aFontData.mSize.GetUnit()) { - aFont->mSize = defaultVariableFont->size; + // The initial value is 'medium', which has magical sizing based on + // the generic font family, so do that here too. + aFont->mSize = aDefaultFont.size; zoom = PR_TRUE; }