From 9dbd8b92be9af406cfd7647f77a778810be1f80b Mon Sep 17 00:00:00 2001 From: "bmlk%gmx.de" Date: Sat, 9 Oct 2004 12:25:31 +0000 Subject: [PATCH] reorganize CalCDominantBorder, reduce the number of arguments, change the border structure. make the rules handling more evident, bug 229883, With more than a little help from my friends (fantasai, boris) r/sr=bzbarsky bustage fix --- content/html/style/src/nsHTMLStyleSheet.cpp | 2 +- layout/style/nsHTMLStyleSheet.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/html/style/src/nsHTMLStyleSheet.cpp b/content/html/style/src/nsHTMLStyleSheet.cpp index 6f3f9abba879..5832353cb52e 100644 --- a/content/html/style/src/nsHTMLStyleSheet.cpp +++ b/content/html/style/src/nsHTMLStyleSheet.cpp @@ -218,7 +218,7 @@ ProcessTableRulesAttribute(nsStyleStruct* aStyleStruct, (NS_STYLE_BORDER_STYLE_SOLID != bStyle)) { bStyle = NS_STYLE_BORDER_STYLE_SOLID; } - bStyle |= NS_STYLE_BORDER_STYLE_RULES_MASK; + bStyle |= NS_STYLE_BORDER_STYLE_RULES_MARKER; borderData->SetBorderStyle(aSide, bStyle); nscolor borderColor; diff --git a/layout/style/nsHTMLStyleSheet.cpp b/layout/style/nsHTMLStyleSheet.cpp index 6f3f9abba879..5832353cb52e 100644 --- a/layout/style/nsHTMLStyleSheet.cpp +++ b/layout/style/nsHTMLStyleSheet.cpp @@ -218,7 +218,7 @@ ProcessTableRulesAttribute(nsStyleStruct* aStyleStruct, (NS_STYLE_BORDER_STYLE_SOLID != bStyle)) { bStyle = NS_STYLE_BORDER_STYLE_SOLID; } - bStyle |= NS_STYLE_BORDER_STYLE_RULES_MASK; + bStyle |= NS_STYLE_BORDER_STYLE_RULES_MARKER; borderData->SetBorderStyle(aSide, bStyle); nscolor borderColor;