From ae28ae47d56376aef013cd42e3dfdae912462ca7 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Wed, 11 Feb 2004 04:34:12 +0000 Subject: [PATCH] Remove NS_STYLE_BORDER_STYLE_BLANK. r+sr=bzbarsky git-svn-id: svn://10.0.0.236/trunk@152645 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/base/nsCSSRendering.cpp | 5 +---- mozilla/layout/base/nsStyleConsts.h | 13 ++++++------- mozilla/layout/base/public/nsStyleConsts.h | 13 ++++++------- mozilla/layout/html/style/src/nsCSSRendering.cpp | 5 +---- 4 files changed, 14 insertions(+), 22 deletions(-) diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp index c64f202fb11..63c0bc75c97 100644 --- a/mozilla/layout/base/nsCSSRendering.cpp +++ b/mozilla/layout/base/nsCSSRendering.cpp @@ -518,7 +518,6 @@ void nsCSSRendering::DrawSide(nsIRenderingContext& aContext, switch (theStyle) { case NS_STYLE_BORDER_STYLE_NONE: case NS_STYLE_BORDER_STYLE_HIDDEN: - case NS_STYLE_BORDER_STYLE_BLANK: return; case NS_STYLE_BORDER_STYLE_DOTTED: //handled a special case elsewhere @@ -3763,7 +3762,6 @@ nsCSSRendering::RenderSide(nsFloatPoint aPoints[],nsIRenderingContext& aRenderin break; case NS_STYLE_BORDER_STYLE_NONE: case NS_STYLE_BORDER_STYLE_HIDDEN: - case NS_STYLE_BORDER_STYLE_BLANK: break; case NS_STYLE_BORDER_STYLE_RIDGE: case NS_STYLE_BORDER_STYLE_GROOVE: @@ -4291,8 +4289,7 @@ nsCSSRendering::DrawTableBorderSegment(nsIRenderingContext& aContext, switch (aBorderStyle) { case NS_STYLE_BORDER_STYLE_NONE: case NS_STYLE_BORDER_STYLE_HIDDEN: - case NS_STYLE_BORDER_STYLE_BLANK: - //NS_ASSERTION(PR_FALSE, "style of none, hidden, or blank"); + //NS_ASSERTION(PR_FALSE, "style of none or hidden"); break; case NS_STYLE_BORDER_STYLE_DOTTED: case NS_STYLE_BORDER_STYLE_DASHED: diff --git a/mozilla/layout/base/nsStyleConsts.h b/mozilla/layout/base/nsStyleConsts.h index 228e449e568..037ef70742e 100644 --- a/mozilla/layout/base/nsStyleConsts.h +++ b/mozilla/layout/base/nsStyleConsts.h @@ -251,13 +251,12 @@ #define NS_STYLE_BORDER_STYLE_DASHED 4 #define NS_STYLE_BORDER_STYLE_SOLID 5 #define NS_STYLE_BORDER_STYLE_DOUBLE 6 -#define NS_STYLE_BORDER_STYLE_BLANK 7 -#define NS_STYLE_BORDER_STYLE_INSET 8 -#define NS_STYLE_BORDER_STYLE_OUTSET 9 -#define NS_STYLE_BORDER_STYLE_HIDDEN 10 -#define NS_STYLE_BORDER_STYLE_BG_INSET 11 -#define NS_STYLE_BORDER_STYLE_BG_OUTSET 12 -#define NS_STYLE_BORDER_STYLE_BG_SOLID 13 +#define NS_STYLE_BORDER_STYLE_INSET 7 +#define NS_STYLE_BORDER_STYLE_OUTSET 8 +#define NS_STYLE_BORDER_STYLE_HIDDEN 9 +#define NS_STYLE_BORDER_STYLE_BG_INSET 10 +#define NS_STYLE_BORDER_STYLE_BG_OUTSET 11 +#define NS_STYLE_BORDER_STYLE_BG_SOLID 12 // a bit ORed onto the style for table border collapsing indicating that the style was // derived from a table with its rules attribute set #define NS_STYLE_BORDER_STYLE_RULES_MASK 0x10 diff --git a/mozilla/layout/base/public/nsStyleConsts.h b/mozilla/layout/base/public/nsStyleConsts.h index 228e449e568..037ef70742e 100644 --- a/mozilla/layout/base/public/nsStyleConsts.h +++ b/mozilla/layout/base/public/nsStyleConsts.h @@ -251,13 +251,12 @@ #define NS_STYLE_BORDER_STYLE_DASHED 4 #define NS_STYLE_BORDER_STYLE_SOLID 5 #define NS_STYLE_BORDER_STYLE_DOUBLE 6 -#define NS_STYLE_BORDER_STYLE_BLANK 7 -#define NS_STYLE_BORDER_STYLE_INSET 8 -#define NS_STYLE_BORDER_STYLE_OUTSET 9 -#define NS_STYLE_BORDER_STYLE_HIDDEN 10 -#define NS_STYLE_BORDER_STYLE_BG_INSET 11 -#define NS_STYLE_BORDER_STYLE_BG_OUTSET 12 -#define NS_STYLE_BORDER_STYLE_BG_SOLID 13 +#define NS_STYLE_BORDER_STYLE_INSET 7 +#define NS_STYLE_BORDER_STYLE_OUTSET 8 +#define NS_STYLE_BORDER_STYLE_HIDDEN 9 +#define NS_STYLE_BORDER_STYLE_BG_INSET 10 +#define NS_STYLE_BORDER_STYLE_BG_OUTSET 11 +#define NS_STYLE_BORDER_STYLE_BG_SOLID 12 // a bit ORed onto the style for table border collapsing indicating that the style was // derived from a table with its rules attribute set #define NS_STYLE_BORDER_STYLE_RULES_MASK 0x10 diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp index c64f202fb11..63c0bc75c97 100644 --- a/mozilla/layout/html/style/src/nsCSSRendering.cpp +++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp @@ -518,7 +518,6 @@ void nsCSSRendering::DrawSide(nsIRenderingContext& aContext, switch (theStyle) { case NS_STYLE_BORDER_STYLE_NONE: case NS_STYLE_BORDER_STYLE_HIDDEN: - case NS_STYLE_BORDER_STYLE_BLANK: return; case NS_STYLE_BORDER_STYLE_DOTTED: //handled a special case elsewhere @@ -3763,7 +3762,6 @@ nsCSSRendering::RenderSide(nsFloatPoint aPoints[],nsIRenderingContext& aRenderin break; case NS_STYLE_BORDER_STYLE_NONE: case NS_STYLE_BORDER_STYLE_HIDDEN: - case NS_STYLE_BORDER_STYLE_BLANK: break; case NS_STYLE_BORDER_STYLE_RIDGE: case NS_STYLE_BORDER_STYLE_GROOVE: @@ -4291,8 +4289,7 @@ nsCSSRendering::DrawTableBorderSegment(nsIRenderingContext& aContext, switch (aBorderStyle) { case NS_STYLE_BORDER_STYLE_NONE: case NS_STYLE_BORDER_STYLE_HIDDEN: - case NS_STYLE_BORDER_STYLE_BLANK: - //NS_ASSERTION(PR_FALSE, "style of none, hidden, or blank"); + //NS_ASSERTION(PR_FALSE, "style of none or hidden"); break; case NS_STYLE_BORDER_STYLE_DOTTED: case NS_STYLE_BORDER_STYLE_DASHED: