From 3f52aba14255f8800681589e8c307e7d053f94ec Mon Sep 17 00:00:00 2001 From: kipp Date: Thu, 28 May 1998 19:55:42 +0000 Subject: [PATCH] Use mOpacity as a float in the nsStyleColor struct git-svn-id: svn://10.0.0.236/trunk@2554 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 e4c66be6dd8..b3c267cda08 100644 --- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp @@ -845,10 +845,10 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // opacity: factor, percent, enum if (ourColor->mOpacity.GetUnit() == eCSSUnit_Percent) { - color->mOpacity.SetPercentValue(ourColor->mOpacity.GetPercentValue()); + color->mOpacity = ourColor->mOpacity.GetPercentValue(); } else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Number) { - color->mOpacity.SetFactorValue(ourColor->mOpacity.GetFloatValue()); + color->mOpacity = ourColor->mOpacity.GetFloatValue(); } else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Enumerated) { // Only enum value is inherit diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp index e4c66be6dd8..b3c267cda08 100644 --- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp +++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp @@ -845,10 +845,10 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // opacity: factor, percent, enum if (ourColor->mOpacity.GetUnit() == eCSSUnit_Percent) { - color->mOpacity.SetPercentValue(ourColor->mOpacity.GetPercentValue()); + color->mOpacity = ourColor->mOpacity.GetPercentValue(); } else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Number) { - color->mOpacity.SetFactorValue(ourColor->mOpacity.GetFloatValue()); + color->mOpacity = ourColor->mOpacity.GetFloatValue(); } else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Enumerated) { // Only enum value is inherit diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp index e4c66be6dd8..b3c267cda08 100644 --- a/mozilla/layout/style/nsCSSStyleRule.cpp +++ b/mozilla/layout/style/nsCSSStyleRule.cpp @@ -845,10 +845,10 @@ void CSSStyleRuleImpl::MapStyleInto(nsIStyleContext* aContext, nsIPresContext* a // opacity: factor, percent, enum if (ourColor->mOpacity.GetUnit() == eCSSUnit_Percent) { - color->mOpacity.SetPercentValue(ourColor->mOpacity.GetPercentValue()); + color->mOpacity = ourColor->mOpacity.GetPercentValue(); } else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Number) { - color->mOpacity.SetFactorValue(ourColor->mOpacity.GetFloatValue()); + color->mOpacity = ourColor->mOpacity.GetFloatValue(); } else if (ourColor->mOpacity.GetUnit() == eCSSUnit_Enumerated) { // Only enum value is inherit