From 19ed791fd088e8cfbffb972c6a71a5d0668125f0 Mon Sep 17 00:00:00 2001
From: "peterl%netscape.com"
 <peterl%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 17 Jul 1998 05:49:03 +0000
Subject: [PATCH] fixed fixed font handling

git-svn-id: svn://10.0.0.236/trunk@5800 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/html/style/src/nsCSSStyleRule.cpp | 6 +++---
 mozilla/layout/html/style/src/nsCSSStyleRule.cpp  | 6 +++---
 mozilla/layout/style/nsCSSStyleRule.cpp           | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
index 0f877a4f252..ba83e85bbb6 100644
--- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
@@ -576,7 +576,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
             case NS_STYLE_FONT_WEIGHT_BOLDER:
             case NS_STYLE_FONT_WEIGHT_LIGHTER:
               font->mFont.weight = (parentFont->mFont.weight + value);
-              font->mFixedFont.weight = (parentFont->mFont.weight + value);
+              font->mFixedFont.weight = (parentFont->mFixedFont.weight + value);
               break;
           }
         }
@@ -617,7 +617,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
               if (parentFont->mFont.size > (nscoord)((float)normal.size * kFontScale[index]))
                 break;
             font->mFont.size = (nscoord)((float)normal.size * kFontScale[index]);
-            font->mFixedFont.size = (nscoord)((float)normal.size * kFontScale[index]);
+            font->mFixedFont.size = (nscoord)((float)normalFixed.size * kFontScale[index]);
           }
         }
         else if (ourFont->mSize.IsLengthUnit()) {
@@ -626,7 +626,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
         }
         else if (ourFont->mSize.GetUnit() == eCSSUnit_Percent) {
           font->mFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
-          font->mFixedFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
+          font->mFixedFont.size = (nscoord)((float)(parentFont->mFixedFont.size) * ourFont->mSize.GetPercentValue());
         }
 
         NS_IF_RELEASE(parentContext);
diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
index 0f877a4f252..ba83e85bbb6 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
@@ -576,7 +576,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
             case NS_STYLE_FONT_WEIGHT_BOLDER:
             case NS_STYLE_FONT_WEIGHT_LIGHTER:
               font->mFont.weight = (parentFont->mFont.weight + value);
-              font->mFixedFont.weight = (parentFont->mFont.weight + value);
+              font->mFixedFont.weight = (parentFont->mFixedFont.weight + value);
               break;
           }
         }
@@ -617,7 +617,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
               if (parentFont->mFont.size > (nscoord)((float)normal.size * kFontScale[index]))
                 break;
             font->mFont.size = (nscoord)((float)normal.size * kFontScale[index]);
-            font->mFixedFont.size = (nscoord)((float)normal.size * kFontScale[index]);
+            font->mFixedFont.size = (nscoord)((float)normalFixed.size * kFontScale[index]);
           }
         }
         else if (ourFont->mSize.IsLengthUnit()) {
@@ -626,7 +626,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
         }
         else if (ourFont->mSize.GetUnit() == eCSSUnit_Percent) {
           font->mFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
-          font->mFixedFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
+          font->mFixedFont.size = (nscoord)((float)(parentFont->mFixedFont.size) * ourFont->mSize.GetPercentValue());
         }
 
         NS_IF_RELEASE(parentContext);
diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp
index 0f877a4f252..ba83e85bbb6 100644
--- a/mozilla/layout/style/nsCSSStyleRule.cpp
+++ b/mozilla/layout/style/nsCSSStyleRule.cpp
@@ -576,7 +576,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
             case NS_STYLE_FONT_WEIGHT_BOLDER:
             case NS_STYLE_FONT_WEIGHT_LIGHTER:
               font->mFont.weight = (parentFont->mFont.weight + value);
-              font->mFixedFont.weight = (parentFont->mFont.weight + value);
+              font->mFixedFont.weight = (parentFont->mFixedFont.weight + value);
               break;
           }
         }
@@ -617,7 +617,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
               if (parentFont->mFont.size > (nscoord)((float)normal.size * kFontScale[index]))
                 break;
             font->mFont.size = (nscoord)((float)normal.size * kFontScale[index]);
-            font->mFixedFont.size = (nscoord)((float)normal.size * kFontScale[index]);
+            font->mFixedFont.size = (nscoord)((float)normalFixed.size * kFontScale[index]);
           }
         }
         else if (ourFont->mSize.IsLengthUnit()) {
@@ -626,7 +626,7 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a
         }
         else if (ourFont->mSize.GetUnit() == eCSSUnit_Percent) {
           font->mFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
-          font->mFixedFont.size = (nscoord)((float)(parentFont->mFont.size) * ourFont->mSize.GetPercentValue());
+          font->mFixedFont.size = (nscoord)((float)(parentFont->mFixedFont.size) * ourFont->mSize.GetPercentValue());
         }
 
         NS_IF_RELEASE(parentContext);