From ed6f7b2bac027ebe9dfbcaad47ca41fcb52b56d9 Mon Sep 17 00:00:00 2001 From: "pierre%netscape.com" Date: Tue, 14 Mar 2000 07:30:29 +0000 Subject: [PATCH] #30127 "-moz-fixed not friendly with the cascade". Inherit NS_STYLE_FONT_USE_FIXED together with the font face. git-svn-id: svn://10.0.0.236/trunk@62901 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/style/src/nsCSSStyleRule.cpp | 4 ++-- mozilla/layout/html/style/src/nsCSSStyleRule.cpp | 4 ++-- mozilla/layout/style/nsCSSStyleRule.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp index f431366753a..7b728f9c00a 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -1312,8 +1312,8 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) { font->mFont.name = parentFont->mFont.name; font->mFixedFont.name = parentFont->mFixedFont.name; - font->mFlags &= ~NS_STYLE_FONT_FACE_EXPLICIT; - font->mFlags |= (parentFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT); + font->mFlags &= ~(NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED); + font->mFlags |= (parentFont->mFlags & (NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED)); } // font-style: enum, normal, inherit diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index f431366753a..7b728f9c00a 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -1312,8 +1312,8 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) { font->mFont.name = parentFont->mFont.name; font->mFixedFont.name = parentFont->mFixedFont.name; - font->mFlags &= ~NS_STYLE_FONT_FACE_EXPLICIT; - font->mFlags |= (parentFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT); + font->mFlags &= ~(NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED); + font->mFlags |= (parentFont->mFlags & (NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED)); } // font-style: enum, normal, inherit diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index f431366753a..7b728f9c00a 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -1312,8 +1312,8 @@ MapDeclarationFontInto(nsICSSDeclaration* aDeclaration, else if (eCSSUnit_Inherit == ourFont->mFamily.GetUnit()) { font->mFont.name = parentFont->mFont.name; font->mFixedFont.name = parentFont->mFixedFont.name; - font->mFlags &= ~NS_STYLE_FONT_FACE_EXPLICIT; - font->mFlags |= (parentFont->mFlags & NS_STYLE_FONT_FACE_EXPLICIT); + font->mFlags &= ~(NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED); + font->mFlags |= (parentFont->mFlags & (NS_STYLE_FONT_FACE_EXPLICIT | NS_STYLE_FONT_USE_FIXED)); } // font-style: enum, normal, inherit