From 389de9359de54326549ab5bc9434884082bf6804 Mon Sep 17 00:00:00 2001
From: Daniel Holbert <dholbert@cs.stanford.edu>
Date: Wed, 21 Oct 2009 17:05:07 -0700
Subject: [PATCH] Bug 522320 bustage fix (handle 'normal' value for
 font-variant/font-style in two other places).

---
 layout/style/nsCSSDeclaration.cpp | 4 ++--
 layout/style/nsCSSParser.cpp      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/layout/style/nsCSSDeclaration.cpp b/layout/style/nsCSSDeclaration.cpp
index 8fd9b931b66..8f15f7de007 100644
--- a/layout/style/nsCSSDeclaration.cpp
+++ b/layout/style/nsCSSDeclaration.cpp
@@ -977,11 +977,11 @@ nsCSSDeclaration::GetValue(nsCSSProperty aProperty,
           return NS_OK;
         }
 
-        if (style.GetUnit() != eCSSUnit_Normal) {
+        if (style.GetIntValue() != NS_FONT_STYLE_NORMAL) {
           AppendCSSValueToString(eCSSProperty_font_style, style, aValue);
           aValue.Append(PRUnichar(' '));
         }
-        if (variant.GetUnit() != eCSSUnit_Normal) {
+        if (variant.GetIntValue() != NS_FONT_VARIANT_NORMAL) {
           AppendCSSValueToString(eCSSProperty_font_variant, variant, aValue);
           aValue.Append(PRUnichar(' '));
         }
diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp
index 83853f788f1..014dd2fa2fb 100644
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -7362,11 +7362,11 @@ CSSParserImpl::ParseFont()
   }
   if ((found & 1) == 0) {
     // Provide default font-style
-    values[0].SetNormalValue();
+    values[0].SetIntValue(NS_FONT_STYLE_NORMAL, eCSSUnit_Enumerated);
   }
   if ((found & 2) == 0) {
     // Provide default font-variant
-    values[1].SetNormalValue();
+    values[1].SetIntValue(NS_FONT_VARIANT_NORMAL, eCSSUnit_Enumerated);
   }
   if ((found & 4) == 0) {
     // Provide default font-weight