--- a/gfx/2d/Types.h
+++ b/gfx/2d/Types.h
@@ -419,21 +419,16 @@ static inline Side& operator++(Side& sid
enum Corner {
// This order is important!
eCornerTopLeft = 0,
eCornerTopRight = 1,
eCornerBottomRight = 2,
eCornerBottomLeft = 3
};
-#define NS_CORNER_TOP_LEFT mozilla::eCornerTopLeft
-#define NS_CORNER_TOP_RIGHT mozilla::eCornerTopRight
-#define NS_CORNER_BOTTOM_RIGHT mozilla::eCornerBottomRight
-#define NS_CORNER_BOTTOM_LEFT mozilla::eCornerBottomLeft
-
// Creates a for loop that walks over the four mozilla::Corner values. This
// implementation uses the same technique as NS_FOR_CSS_SIDES.
#define NS_FOR_CSS_FULL_CORNERS(var_) \
int32_t MOZ_CONCAT(var_,__LINE__) = mozilla::eCornerTopLeft; \
for (mozilla::Corner var_; \
MOZ_CONCAT(var_,__LINE__) <= mozilla::eCornerBottomLeft && \
(var_ = mozilla::Corner(MOZ_CONCAT(var_,__LINE__)), true); \
++MOZ_CONCAT(var_,__LINE__))
--- a/gfx/thebes/RoundedRect.h
+++ b/gfx/thebes/RoundedRect.h
@@ -19,25 +19,33 @@ struct RoundedRect {
RoundedRect(gfxRect &aRect, RectCornerRadii &aCorners) : rect(aRect), corners(aCorners) { }
void Deflate(gfxFloat aTopWidth, gfxFloat aBottomWidth, gfxFloat aLeftWidth, gfxFloat aRightWidth) {
// deflate the internal rect
rect.x += aLeftWidth;
rect.y += aTopWidth;
rect.width = std::max(0., rect.width - aLeftWidth - aRightWidth);
rect.height = std::max(0., rect.height - aTopWidth - aBottomWidth);
- corners.radii[NS_CORNER_TOP_LEFT].width = std::max(0., corners.radii[NS_CORNER_TOP_LEFT].width - aLeftWidth);
- corners.radii[NS_CORNER_TOP_LEFT].height = std::max(0., corners.radii[NS_CORNER_TOP_LEFT].height - aTopWidth);
+ corners.radii[mozilla::eCornerTopLeft].width =
+ std::max(0., corners.radii[mozilla::eCornerTopLeft].width - aLeftWidth);
+ corners.radii[mozilla::eCornerTopLeft].height =
+ std::max(0., corners.radii[mozilla::eCornerTopLeft].height - aTopWidth);
- corners.radii[NS_CORNER_TOP_RIGHT].width = std::max(0., corners.radii[NS_CORNER_TOP_RIGHT].width - aRightWidth);
- corners.radii[NS_CORNER_TOP_RIGHT].height = std::max(0., corners.radii[NS_CORNER_TOP_RIGHT].height - aTopWidth);
+ corners.radii[mozilla::eCornerTopRight].width =
+ std::max(0., corners.radii[mozilla::eCornerTopRight].width - aRightWidth);
+ corners.radii[mozilla::eCornerTopRight].height =
+ std::max(0., corners.radii[mozilla::eCornerTopRight].height - aTopWidth);
- corners.radii[NS_CORNER_BOTTOM_LEFT].width = std::max(0., corners.radii[NS_CORNER_BOTTOM_LEFT].width - aLeftWidth);
- corners.radii[NS_CORNER_BOTTOM_LEFT].height = std::max(0., corners.radii[NS_CORNER_BOTTOM_LEFT].height - aBottomWidth);
+ corners.radii[mozilla::eCornerBottomLeft].width =
+ std::max(0., corners.radii[mozilla::eCornerBottomLeft].width - aLeftWidth);
+ corners.radii[mozilla::eCornerBottomLeft].height =
+ std::max(0., corners.radii[mozilla::eCornerBottomLeft].height - aBottomWidth);
- corners.radii[NS_CORNER_BOTTOM_RIGHT].width = std::max(0., corners.radii[NS_CORNER_BOTTOM_RIGHT].width - aRightWidth);
- corners.radii[NS_CORNER_BOTTOM_RIGHT].height = std::max(0., corners.radii[NS_CORNER_BOTTOM_RIGHT].height - aBottomWidth);
+ corners.radii[mozilla::eCornerBottomRight].width =
+ std::max(0., corners.radii[mozilla::eCornerBottomRight].width - aRightWidth);
+ corners.radii[mozilla::eCornerBottomRight].height =
+ std::max(0., corners.radii[mozilla::eCornerBottomRight].height - aBottomWidth);
}
gfxRect rect;
RectCornerRadii corners;
};
} // namespace mozilla
--- a/gfx/thebes/gfxRect.h
+++ b/gfx/thebes/gfxRect.h
@@ -42,20 +42,20 @@ struct gfxRect :
* aEpsilon of integer coordinates, defined as
* |round(coord) - coord| <= |aEpsilon|
* for x,y,width,height.
*/
bool WithinEpsilonOfIntegerPixels(gfxFloat aEpsilon) const;
gfxPoint AtCorner(mozilla::Corner corner) const {
switch (corner) {
- case NS_CORNER_TOP_LEFT: return TopLeft();
- case NS_CORNER_TOP_RIGHT: return TopRight();
- case NS_CORNER_BOTTOM_RIGHT: return BottomRight();
- case NS_CORNER_BOTTOM_LEFT: return BottomLeft();
+ case mozilla::eCornerTopLeft: return TopLeft();
+ case mozilla::eCornerTopRight: return TopRight();
+ case mozilla::eCornerBottomRight: return BottomRight();
+ case mozilla::eCornerBottomLeft: return BottomLeft();
}
return gfxPoint(0.0, 0.0);
}
gfxPoint CCWCorner(mozilla::Side side) const {
switch (side) {
case mozilla::eSideTop: return TopLeft();
case mozilla::eSideRight: return TopRight();
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -6782,40 +6782,40 @@ nsLayoutUtils::HasNonZeroCorner(const ns
return true;
}
return false;
}
// aCorner is a "full corner" value, i.e. NS_CORNER_TOP_LEFT etc
static bool IsCornerAdjacentToSide(uint8_t aCorner, Side aSide)
{
- static_assert((int)eSideTop == NS_CORNER_TOP_LEFT, "Check for Full Corner");
- static_assert((int)eSideRight == NS_CORNER_TOP_RIGHT, "Check for Full Corner");
- static_assert((int)eSideBottom == NS_CORNER_BOTTOM_RIGHT, "Check for Full Corner");
- static_assert((int)eSideLeft == NS_CORNER_BOTTOM_LEFT, "Check for Full Corner");
- static_assert((int)eSideTop == ((NS_CORNER_TOP_RIGHT - 1)&3), "Check for Full Corner");
- static_assert((int)eSideRight == ((NS_CORNER_BOTTOM_RIGHT - 1)&3), "Check for Full Corner");
- static_assert((int)eSideBottom == ((NS_CORNER_BOTTOM_LEFT - 1)&3), "Check for Full Corner");
- static_assert((int)eSideLeft == ((NS_CORNER_TOP_LEFT - 1)&3), "Check for Full Corner");
+ static_assert((int)eSideTop == eCornerTopLeft, "Check for Full Corner");
+ static_assert((int)eSideRight == eCornerTopRight, "Check for Full Corner");
+ static_assert((int)eSideBottom == eCornerBottomRight, "Check for Full Corner");
+ static_assert((int)eSideLeft == eCornerBottomLeft, "Check for Full Corner");
+ static_assert((int)eSideTop == ((eCornerTopRight - 1)&3), "Check for Full Corner");
+ static_assert((int)eSideRight == ((eCornerBottomRight - 1)&3), "Check for Full Corner");
+ static_assert((int)eSideBottom == ((eCornerBottomLeft - 1)&3), "Check for Full Corner");
+ static_assert((int)eSideLeft == ((eCornerTopLeft - 1)&3), "Check for Full Corner");
return aSide == aCorner || aSide == ((aCorner - 1)&3);
}
/* static */ bool
nsLayoutUtils::HasNonZeroCornerOnSide(const nsStyleCorners& aCorners,
Side aSide)
{
- static_assert(NS_CORNER_TOP_LEFT_X/2 == NS_CORNER_TOP_LEFT, "Check for Non Zero on side");
- static_assert(NS_CORNER_TOP_LEFT_Y/2 == NS_CORNER_TOP_LEFT, "Check for Non Zero on side");
- static_assert(NS_CORNER_TOP_RIGHT_X/2 == NS_CORNER_TOP_RIGHT, "Check for Non Zero on side");
- static_assert(NS_CORNER_TOP_RIGHT_Y/2 == NS_CORNER_TOP_RIGHT, "Check for Non Zero on side");
- static_assert(NS_CORNER_BOTTOM_RIGHT_X/2 == NS_CORNER_BOTTOM_RIGHT, "Check for Non Zero on side");
- static_assert(NS_CORNER_BOTTOM_RIGHT_Y/2 == NS_CORNER_BOTTOM_RIGHT, "Check for Non Zero on side");
- static_assert(NS_CORNER_BOTTOM_LEFT_X/2 == NS_CORNER_BOTTOM_LEFT, "Check for Non Zero on side");
- static_assert(NS_CORNER_BOTTOM_LEFT_Y/2 == NS_CORNER_BOTTOM_LEFT, "Check for Non Zero on side");
+ static_assert(NS_CORNER_TOP_LEFT_X/2 == eCornerTopLeft, "Check for Non Zero on side");
+ static_assert(NS_CORNER_TOP_LEFT_Y/2 == eCornerTopLeft, "Check for Non Zero on side");
+ static_assert(NS_CORNER_TOP_RIGHT_X/2 == eCornerTopRight, "Check for Non Zero on side");
+ static_assert(NS_CORNER_TOP_RIGHT_Y/2 == eCornerTopRight, "Check for Non Zero on side");
+ static_assert(NS_CORNER_BOTTOM_RIGHT_X/2 == eCornerBottomRight, "Check for Non Zero on side");
+ static_assert(NS_CORNER_BOTTOM_RIGHT_Y/2 == eCornerBottomRight, "Check for Non Zero on side");
+ static_assert(NS_CORNER_BOTTOM_LEFT_X/2 == eCornerBottomLeft, "Check for Non Zero on side");
+ static_assert(NS_CORNER_BOTTOM_LEFT_Y/2 == eCornerBottomLeft, "Check for Non Zero on side");
NS_FOR_CSS_HALF_CORNERS(corner) {
// corner is a "half corner" value, so dividing by two gives us a
// "full corner" value.
if (NonZeroStyleCoord(aCorners.Get(corner)) &&
IsCornerAdjacentToSide(corner/2, aSide))
return true;
}
--- a/layout/painting/BorderConsts.h
+++ b/layout/painting/BorderConsts.h
@@ -5,17 +5,17 @@
#ifndef mozilla_BorderConsts_h_
#define mozilla_BorderConsts_h_
// thickness of dashed line relative to dotted line
#define DOT_LENGTH 1 // square
#define DASH_LENGTH 3 // 3 times longer than dot
-#define C_TL NS_CORNER_TOP_LEFT
-#define C_TR NS_CORNER_TOP_RIGHT
-#define C_BR NS_CORNER_BOTTOM_RIGHT
-#define C_BL NS_CORNER_BOTTOM_LEFT
+#define C_TL mozilla::eCornerTopLeft
+#define C_TR mozilla::eCornerTopRight
+#define C_BR mozilla::eCornerBottomRight
+#define C_BL mozilla::eCornerBottomLeft
#define BORDER_SEGMENT_COUNT_MAX 100
#define BORDER_DOTTED_CORNER_MAX_RADIUS 100000
#endif /* mozilla_BorderConsts_h_ */
--- a/layout/painting/nsCSSRenderingBorders.cpp
+++ b/layout/painting/nsCSSRenderingBorders.cpp
@@ -103,20 +103,20 @@ CheckFourFloatsEqual(const Float *vals,
static bool
IsZeroSize(const Size& sz) {
return sz.width == 0.0 || sz.height == 0.0;
}
/* static */ bool
nsCSSBorderRenderer::AllCornersZeroSize(const RectCornerRadii& corners) {
- return IsZeroSize(corners[NS_CORNER_TOP_LEFT]) &&
- IsZeroSize(corners[NS_CORNER_TOP_RIGHT]) &&
- IsZeroSize(corners[NS_CORNER_BOTTOM_RIGHT]) &&
- IsZeroSize(corners[NS_CORNER_BOTTOM_LEFT]);
+ return IsZeroSize(corners[eCornerTopLeft]) &&
+ IsZeroSize(corners[eCornerTopRight]) &&
+ IsZeroSize(corners[eCornerBottomRight]) &&
+ IsZeroSize(corners[eCornerBottomLeft]);
}
static mozilla::Side
GetHorizontalSide(Corner aCorner)
{
return (aCorner == C_TL || aCorner == C_TR) ? eSideTop : eSideBottom;
}
@@ -337,21 +337,21 @@ bool
nsCSSBorderRenderer::IsSolidCornerStyle(uint8_t aStyle, Corner aCorner)
{
switch (aStyle) {
case NS_STYLE_BORDER_STYLE_SOLID:
return true;
case NS_STYLE_BORDER_STYLE_INSET:
case NS_STYLE_BORDER_STYLE_OUTSET:
- return (aCorner == NS_CORNER_TOP_LEFT || aCorner == NS_CORNER_BOTTOM_RIGHT);
+ return (aCorner == eCornerTopLeft || aCorner == eCornerBottomRight);
case NS_STYLE_BORDER_STYLE_GROOVE:
case NS_STYLE_BORDER_STYLE_RIDGE:
- return mOneUnitBorder && (aCorner == NS_CORNER_TOP_LEFT || aCorner == NS_CORNER_BOTTOM_RIGHT);
+ return mOneUnitBorder && (aCorner == eCornerTopLeft || aCorner == eCornerBottomRight);
case NS_STYLE_BORDER_STYLE_DOUBLE:
return mOneUnitBorder;
default:
return false;
}
}
@@ -413,27 +413,27 @@ nsCSSBorderRenderer::BorderColorStyleFor
// as per the earlier function
switch (aStyle) {
case NS_STYLE_BORDER_STYLE_SOLID:
case NS_STYLE_BORDER_STYLE_DOUBLE:
return BorderColorStyleSolid;
case NS_STYLE_BORDER_STYLE_INSET:
case NS_STYLE_BORDER_STYLE_GROOVE:
- if (aCorner == NS_CORNER_TOP_LEFT)
+ if (aCorner == eCornerTopLeft)
return BorderColorStyleDark;
- else if (aCorner == NS_CORNER_BOTTOM_RIGHT)
+ else if (aCorner == eCornerBottomRight)
return BorderColorStyleLight;
break;
case NS_STYLE_BORDER_STYLE_OUTSET:
case NS_STYLE_BORDER_STYLE_RIDGE:
- if (aCorner == NS_CORNER_TOP_LEFT)
+ if (aCorner == eCornerTopLeft)
return BorderColorStyleLight;
- else if (aCorner == NS_CORNER_BOTTOM_RIGHT)
+ else if (aCorner == eCornerBottomRight)
return BorderColorStyleDark;
break;
}
return BorderColorStyleNone;
}
Rect
@@ -3359,17 +3359,17 @@ nsCSSBorderRenderer::DrawBorders()
NS_FOR_CSS_FULL_CORNERS(corner) {
const mozilla::Side sides[2] = { mozilla::Side(corner), PREV_SIDE(corner) };
if (!IsZeroSize(mBorderRadii[corner]))
continue;
if (mBorderWidths[sides[0]] == 1.0 && mBorderWidths[sides[1]] == 1.0) {
- if (corner == NS_CORNER_TOP_LEFT || corner == NS_CORNER_TOP_RIGHT)
+ if (corner == eCornerTopLeft || corner == eCornerTopRight)
mBorderCornerDimensions[corner].width = 0.0;
else
mBorderCornerDimensions[corner].height = 0.0;
}
}
// First, the corners
NS_FOR_CSS_FULL_CORNERS(corner) {
--- a/layout/style/StyleAnimationValue.cpp
+++ b/layout/style/StyleAnimationValue.cpp
@@ -4675,24 +4675,24 @@ StyleAnimationValue::ExtractComputedValu
Get(mozilla::Side(animType - eStyleAnimType_Sides_Top));
return StyleCoordToValue(coord, aComputedValue);
}
case eStyleAnimType_Corner_TopLeft:
case eStyleAnimType_Corner_TopRight:
case eStyleAnimType_Corner_BottomRight:
case eStyleAnimType_Corner_BottomLeft: {
static_assert(
- NS_CORNER_TOP_LEFT == eStyleAnimType_Corner_TopLeft -
- eStyleAnimType_Corner_TopLeft &&
- NS_CORNER_TOP_RIGHT == eStyleAnimType_Corner_TopRight -
- eStyleAnimType_Corner_TopLeft &&
- NS_CORNER_BOTTOM_RIGHT == eStyleAnimType_Corner_BottomRight -
- eStyleAnimType_Corner_TopLeft &&
- NS_CORNER_BOTTOM_LEFT == eStyleAnimType_Corner_BottomLeft -
- eStyleAnimType_Corner_TopLeft,
+ eCornerTopLeft == eStyleAnimType_Corner_TopLeft -
+ eStyleAnimType_Corner_TopLeft &&
+ eCornerTopRight == eStyleAnimType_Corner_TopRight -
+ eStyleAnimType_Corner_TopLeft &&
+ eCornerBottomRight == eStyleAnimType_Corner_BottomRight -
+ eStyleAnimType_Corner_TopLeft &&
+ eCornerBottomLeft == eStyleAnimType_Corner_BottomLeft -
+ eStyleAnimType_Corner_TopLeft,
"box corner constants out of sync with animation corner constants");
const nsStyleCorners& corners =
StyleDataAtOffset<nsStyleCorners>(styleStruct, ssOffset);
uint8_t fullCorner = animType - eStyleAnimType_Corner_TopLeft;
const nsStyleCoord &horiz =
corners.Get(NS_FULL_TO_HALF_CORNER(fullCorner, false));
const nsStyleCoord &vert =
--- a/layout/style/nsCSSValue.cpp
+++ b/layout/style/nsCSSValue.cpp
@@ -3199,18 +3199,18 @@ nsCSSCornerSizes::~nsCSSCornerSizes()
void
nsCSSCornerSizes::Reset()
{
NS_FOR_CSS_FULL_CORNERS(corner) {
this->GetCorner(corner).Reset();
}
}
-static_assert(NS_CORNER_TOP_LEFT == 0 && NS_CORNER_TOP_RIGHT == 1 &&
- NS_CORNER_BOTTOM_RIGHT == 2 && NS_CORNER_BOTTOM_LEFT == 3,
+static_assert(eCornerTopLeft == 0 && eCornerTopRight == 1 &&
+ eCornerBottomRight == 2 && eCornerBottomLeft == 3,
"box corner constants not tl/tr/br/bl == 0/1/2/3");
/* static */ const nsCSSCornerSizes::corner_type
nsCSSCornerSizes::corners[4] = {
&nsCSSCornerSizes::mTopLeft,
&nsCSSCornerSizes::mTopRight,
&nsCSSCornerSizes::mBottomRight,
&nsCSSCornerSizes::mBottomLeft,
--- a/layout/style/nsComputedDOMStyle.cpp
+++ b/layout/style/nsComputedDOMStyle.cpp
@@ -3123,38 +3123,38 @@ nsComputedDOMStyle::DoGetBorderTopColors
{
return GetBorderColorsFor(eSideTop);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBorderBottomLeftRadius()
{
return GetEllipseRadii(StyleBorder()->mBorderRadius,
- NS_CORNER_BOTTOM_LEFT);
+ eCornerBottomLeft);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBorderBottomRightRadius()
{
return GetEllipseRadii(StyleBorder()->mBorderRadius,
- NS_CORNER_BOTTOM_RIGHT);
+ eCornerBottomRight);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBorderTopLeftRadius()
{
return GetEllipseRadii(StyleBorder()->mBorderRadius,
- NS_CORNER_TOP_LEFT);
+ eCornerTopLeft);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBorderTopRightRadius()
{
return GetEllipseRadii(StyleBorder()->mBorderRadius,
- NS_CORNER_TOP_RIGHT);
+ eCornerTopRight);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetBorderTopWidth()
{
return GetBorderWidthFor(eSideTop);
}
@@ -3374,38 +3374,38 @@ nsComputedDOMStyle::DoGetOutlineOffset()
val->SetAppUnits(StyleOutline()->mOutlineOffset);
return val.forget();
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetOutlineRadiusBottomLeft()
{
return GetEllipseRadii(StyleOutline()->mOutlineRadius,
- NS_CORNER_BOTTOM_LEFT);
+ eCornerBottomLeft);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetOutlineRadiusBottomRight()
{
return GetEllipseRadii(StyleOutline()->mOutlineRadius,
- NS_CORNER_BOTTOM_RIGHT);
+ eCornerBottomRight);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetOutlineRadiusTopLeft()
{
return GetEllipseRadii(StyleOutline()->mOutlineRadius,
- NS_CORNER_TOP_LEFT);
+ eCornerTopLeft);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetOutlineRadiusTopRight()
{
return GetEllipseRadii(StyleOutline()->mOutlineRadius,
- NS_CORNER_TOP_RIGHT);
+ eCornerTopRight);
}
already_AddRefed<CSSValue>
nsComputedDOMStyle::DoGetOutlineColor()
{
RefPtr<nsROCSSPrimitiveValue> val = new nsROCSSPrimitiveValue;
SetValueFromComplexColor(val, StyleOutline()->mOutlineColor);
return val.forget();
--- a/layout/style/nsStyleCoord.cpp
+++ b/layout/style/nsStyleCoord.cpp
@@ -352,55 +352,55 @@ CASE(NS_CORNER_BOTTOM_RIGHT_Y, false);
CASE(NS_CORNER_BOTTOM_LEFT_X, true);
CASE(NS_CORNER_BOTTOM_LEFT_Y, false);
#undef CASE
// Validation of NS_HALF_TO_FULL_CORNER.
#define CASE(corner, result) \
static_assert(NS_HALF_TO_FULL_CORNER(corner) == result, \
"NS_HALF_TO_FULL_CORNER is wrong")
-CASE(NS_CORNER_TOP_LEFT_X, NS_CORNER_TOP_LEFT);
-CASE(NS_CORNER_TOP_LEFT_Y, NS_CORNER_TOP_LEFT);
-CASE(NS_CORNER_TOP_RIGHT_X, NS_CORNER_TOP_RIGHT);
-CASE(NS_CORNER_TOP_RIGHT_Y, NS_CORNER_TOP_RIGHT);
-CASE(NS_CORNER_BOTTOM_RIGHT_X, NS_CORNER_BOTTOM_RIGHT);
-CASE(NS_CORNER_BOTTOM_RIGHT_Y, NS_CORNER_BOTTOM_RIGHT);
-CASE(NS_CORNER_BOTTOM_LEFT_X, NS_CORNER_BOTTOM_LEFT);
-CASE(NS_CORNER_BOTTOM_LEFT_Y, NS_CORNER_BOTTOM_LEFT);
+CASE(NS_CORNER_TOP_LEFT_X, eCornerTopLeft);
+CASE(NS_CORNER_TOP_LEFT_Y, eCornerTopLeft);
+CASE(NS_CORNER_TOP_RIGHT_X, eCornerTopRight);
+CASE(NS_CORNER_TOP_RIGHT_Y, eCornerTopRight);
+CASE(NS_CORNER_BOTTOM_RIGHT_X, eCornerBottomRight);
+CASE(NS_CORNER_BOTTOM_RIGHT_Y, eCornerBottomRight);
+CASE(NS_CORNER_BOTTOM_LEFT_X, eCornerBottomLeft);
+CASE(NS_CORNER_BOTTOM_LEFT_Y, eCornerBottomLeft);
#undef CASE
// Validation of NS_FULL_TO_HALF_CORNER.
#define CASE(corner, vert, result) \
static_assert(NS_FULL_TO_HALF_CORNER(corner, vert) == result, \
"NS_FULL_TO_HALF_CORNER is wrong")
-CASE(NS_CORNER_TOP_LEFT, false, NS_CORNER_TOP_LEFT_X);
-CASE(NS_CORNER_TOP_LEFT, true, NS_CORNER_TOP_LEFT_Y);
-CASE(NS_CORNER_TOP_RIGHT, false, NS_CORNER_TOP_RIGHT_X);
-CASE(NS_CORNER_TOP_RIGHT, true, NS_CORNER_TOP_RIGHT_Y);
-CASE(NS_CORNER_BOTTOM_RIGHT, false, NS_CORNER_BOTTOM_RIGHT_X);
-CASE(NS_CORNER_BOTTOM_RIGHT, true, NS_CORNER_BOTTOM_RIGHT_Y);
-CASE(NS_CORNER_BOTTOM_LEFT, false, NS_CORNER_BOTTOM_LEFT_X);
-CASE(NS_CORNER_BOTTOM_LEFT, true, NS_CORNER_BOTTOM_LEFT_Y);
+CASE(eCornerTopLeft, false, NS_CORNER_TOP_LEFT_X);
+CASE(eCornerTopLeft, true, NS_CORNER_TOP_LEFT_Y);
+CASE(eCornerTopRight, false, NS_CORNER_TOP_RIGHT_X);
+CASE(eCornerTopRight, true, NS_CORNER_TOP_RIGHT_Y);
+CASE(eCornerBottomRight, false, NS_CORNER_BOTTOM_RIGHT_X);
+CASE(eCornerBottomRight, true, NS_CORNER_BOTTOM_RIGHT_Y);
+CASE(eCornerBottomLeft, false, NS_CORNER_BOTTOM_LEFT_X);
+CASE(eCornerBottomLeft, true, NS_CORNER_BOTTOM_LEFT_Y);
#undef CASE
// Validation of NS_SIDE_TO_{FULL,HALF}_CORNER.
#define CASE(side, second, result) \
static_assert(NS_SIDE_TO_FULL_CORNER(side, second) == result, \
"NS_SIDE_TO_FULL_CORNER is wrong")
-CASE(eSideTop, false, NS_CORNER_TOP_LEFT);
-CASE(eSideTop, true, NS_CORNER_TOP_RIGHT);
+CASE(eSideTop, false, eCornerTopLeft);
+CASE(eSideTop, true, eCornerTopRight);
-CASE(eSideRight, false, NS_CORNER_TOP_RIGHT);
-CASE(eSideRight, true, NS_CORNER_BOTTOM_RIGHT);
+CASE(eSideRight, false, eCornerTopRight);
+CASE(eSideRight, true, eCornerBottomRight);
-CASE(eSideBottom, false, NS_CORNER_BOTTOM_RIGHT);
-CASE(eSideBottom, true, NS_CORNER_BOTTOM_LEFT);
+CASE(eSideBottom, false, eCornerBottomRight);
+CASE(eSideBottom, true, eCornerBottomLeft);
-CASE(eSideLeft, false, NS_CORNER_BOTTOM_LEFT);
-CASE(eSideLeft, true, NS_CORNER_TOP_LEFT);
+CASE(eSideLeft, false, eCornerBottomLeft);
+CASE(eSideLeft, true, eCornerTopLeft);
#undef CASE
#define CASE(side, second, parallel, result) \
static_assert(NS_SIDE_TO_HALF_CORNER(side, second, parallel) == result, \
"NS_SIDE_TO_HALF_CORNER is wrong")
CASE(eSideTop, false, true, NS_CORNER_TOP_LEFT_X);
CASE(eSideTop, false, false, NS_CORNER_TOP_LEFT_Y);
CASE(eSideTop, true, true, NS_CORNER_TOP_RIGHT_X);