diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h index 211577e7ab..a1210c9c95 100644 --- a/gfx/2d/Types.h +++ b/gfx/2d/Types.h @@ -414,11 +414,6 @@ enum Corner { 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_) \ diff --git a/gfx/thebes/RoundedRect.h b/gfx/thebes/RoundedRect.h index 6da69275f7..bd2a3bc8a7 100644 --- a/gfx/thebes/RoundedRect.h +++ b/gfx/thebes/RoundedRect.h @@ -24,17 +24,25 @@ struct RoundedRect { 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; diff --git a/gfx/thebes/gfxRect.h b/gfx/thebes/gfxRect.h index dd0e500119..8c1a5ee518 100644 --- a/gfx/thebes/gfxRect.h +++ b/gfx/thebes/gfxRect.h @@ -47,10 +47,10 @@ struct gfxRect : 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); } diff --git a/layout/base/BorderConsts.h b/layout/base/BorderConsts.h index 0bc50e61db..4eea1e1434 100644 --- a/layout/base/BorderConsts.h +++ b/layout/base/BorderConsts.h @@ -10,10 +10,10 @@ #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 diff --git a/layout/base/nsCSSRenderingBorders.cpp b/layout/base/nsCSSRenderingBorders.cpp index 27758bcc0c..9b80ed9ede 100644 --- a/layout/base/nsCSSRenderingBorders.cpp +++ b/layout/base/nsCSSRenderingBorders.cpp @@ -107,10 +107,10 @@ IsZeroSize(const Size& sz) { static bool 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 @@ -340,11 +340,11 @@ nsCSSBorderRenderer::IsSolidCornerStyle(uint8_t aStyle, mozilla::Corner aCorner) 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; @@ -416,17 +416,17 @@ nsCSSBorderRenderer::BorderColorStyleForSolidCorner(uint8_t aStyle, mozilla::Cor 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; } @@ -3392,7 +3392,7 @@ nsCSSBorderRenderer::DrawBorders() 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; diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index 397ca98338..04e90041bb 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -6789,14 +6789,14 @@ nsLayoutUtils::HasNonZeroCorner(const nsStyleCorners& aCorners) // 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); } @@ -6805,14 +6805,14 @@ static bool IsCornerAdjacentToSide(uint8_t aCorner, Side aSide) 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 diff --git a/layout/style/StyleAnimationValue.cpp b/layout/style/StyleAnimationValue.cpp index cfaf19df3c..e007d8335e 100644 --- a/layout/style/StyleAnimationValue.cpp +++ b/layout/style/StyleAnimationValue.cpp @@ -4389,14 +4389,14 @@ StyleAnimationValue::ExtractComputedValue(nsCSSPropertyID aProperty, 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 = diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp index aba5ba42cc..6553ebaf33 100644 --- a/layout/style/nsCSSValue.cpp +++ b/layout/style/nsCSSValue.cpp @@ -3253,8 +3253,8 @@ nsCSSCornerSizes::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 diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 847f7d4415..39449b697a 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -3145,28 +3145,28 @@ already_AddRefed nsComputedDOMStyle::DoGetBorderBottomLeftRadius() { return GetEllipseRadii(StyleBorder()->mBorderRadius, - NS_CORNER_BOTTOM_LEFT); + eCornerBottomLeft); } already_AddRefed nsComputedDOMStyle::DoGetBorderBottomRightRadius() { return GetEllipseRadii(StyleBorder()->mBorderRadius, - NS_CORNER_BOTTOM_RIGHT); + eCornerBottomRight); } already_AddRefed nsComputedDOMStyle::DoGetBorderTopLeftRadius() { return GetEllipseRadii(StyleBorder()->mBorderRadius, - NS_CORNER_TOP_LEFT); + eCornerTopLeft); } already_AddRefed nsComputedDOMStyle::DoGetBorderTopRightRadius() { return GetEllipseRadii(StyleBorder()->mBorderRadius, - NS_CORNER_TOP_RIGHT); + eCornerTopRight); } already_AddRefed @@ -3406,28 +3406,28 @@ already_AddRefed nsComputedDOMStyle::DoGetOutlineRadiusBottomLeft() { return GetEllipseRadii(StyleOutline()->mOutlineRadius, - NS_CORNER_BOTTOM_LEFT); + eCornerBottomLeft); } already_AddRefed nsComputedDOMStyle::DoGetOutlineRadiusBottomRight() { return GetEllipseRadii(StyleOutline()->mOutlineRadius, - NS_CORNER_BOTTOM_RIGHT); + eCornerBottomRight); } already_AddRefed nsComputedDOMStyle::DoGetOutlineRadiusTopLeft() { return GetEllipseRadii(StyleOutline()->mOutlineRadius, - NS_CORNER_TOP_LEFT); + eCornerTopLeft); } already_AddRefed nsComputedDOMStyle::DoGetOutlineRadiusTopRight() { return GetEllipseRadii(StyleOutline()->mOutlineRadius, - NS_CORNER_TOP_RIGHT); + eCornerTopRight); } already_AddRefed diff --git a/layout/style/nsStyleCoord.cpp b/layout/style/nsStyleCoord.cpp index 2fd735308d..05f78108bf 100644 --- a/layout/style/nsStyleCoord.cpp +++ b/layout/style/nsStyleCoord.cpp @@ -355,45 +355,45 @@ CASE(NS_CORNER_BOTTOM_LEFT_Y, false); #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) \