From aaea73e24ca2ded24dcfd2cda50421967b603d20 Mon Sep 17 00:00:00 2001 From: "peterl%netscape.com" Date: Fri, 6 Nov 1998 01:06:26 +0000 Subject: [PATCH] fixed text-decorations some more git-svn-id: svn://10.0.0.236/trunk@14179 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 0debe8957bb..752992c60a3 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -1005,8 +1005,8 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, // text-decoration: none, enum (bit field), inherit if (eCSSUnit_Enumerated == ourText->mDecoration.GetUnit()) { PRInt32 td = ourText->mDecoration.GetIntValue(); - font->mFont.decorations |= td; - font->mFixedFont.decorations |= td; + font->mFont.decorations = (parentFont->mFont.decorations | td); + font->mFixedFont.decorations = (parentFont->mFixedFont.decorations | td); text->mTextDecoration = td; } else if (eCSSUnit_None == ourText->mDecoration.GetUnit()) { diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index 0debe8957bb..752992c60a3 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -1005,8 +1005,8 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, // text-decoration: none, enum (bit field), inherit if (eCSSUnit_Enumerated == ourText->mDecoration.GetUnit()) { PRInt32 td = ourText->mDecoration.GetIntValue(); - font->mFont.decorations |= td; - font->mFixedFont.decorations |= td; + font->mFont.decorations = (parentFont->mFont.decorations | td); + font->mFixedFont.decorations = (parentFont->mFixedFont.decorations | td); text->mTextDecoration = td; } else if (eCSSUnit_None == ourText->mDecoration.GetUnit()) { diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index 0debe8957bb..752992c60a3 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -1005,8 +1005,8 @@ void MapDeclarationInto(nsICSSDeclaration* aDeclaration, // text-decoration: none, enum (bit field), inherit if (eCSSUnit_Enumerated == ourText->mDecoration.GetUnit()) { PRInt32 td = ourText->mDecoration.GetIntValue(); - font->mFont.decorations |= td; - font->mFixedFont.decorations |= td; + font->mFont.decorations = (parentFont->mFont.decorations | td); + font->mFixedFont.decorations = (parentFont->mFixedFont.decorations | td); text->mTextDecoration = td; } else if (eCSSUnit_None == ourText->mDecoration.GetUnit()) {