mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-08-24 05:13:07 +09:00
Issue #1925 - Convert NS_FULL_TO_HALF_CORNER to a constexpr function.
Note: Because the new function checks types, we need to change the fullCorner type in `nsComputedDOMStyle::GetEllipseRadii()` and `StyleAnimationValue::ExtractComputedValue()` to `Corner` instead of the underlying base type.
This commit is contained in:
parent
31badb0f2e
commit
8a2bc8ef4d
7 changed files with 28 additions and 25 deletions
|
|
@ -3945,9 +3945,9 @@ StyleClipBasicShapeToCSSArray(const StyleClipPath& aClipPath,
|
|||
const nsStyleCorners& radii = shape->GetRadius();
|
||||
NS_FOR_CSS_FULL_CORNERS(corner) {
|
||||
auto pair = MakeUnique<nsCSSValuePair>();
|
||||
if (!StyleCoordToCSSValue(radii.Get(NS_FULL_TO_HALF_CORNER(corner, false)),
|
||||
if (!StyleCoordToCSSValue(radii.Get(FullToHalfCorner(corner, false)),
|
||||
pair->mXValue) ||
|
||||
!StyleCoordToCSSValue(radii.Get(NS_FULL_TO_HALF_CORNER(corner, true)),
|
||||
!StyleCoordToCSSValue(radii.Get(FullToHalfCorner(corner, true)),
|
||||
pair->mYValue)) {
|
||||
return false;
|
||||
}
|
||||
|
|
@ -4401,11 +4401,11 @@ StyleAnimationValue::ExtractComputedValue(nsCSSPropertyID aProperty,
|
|||
|
||||
const nsStyleCorners& corners =
|
||||
StyleDataAtOffset<nsStyleCorners>(styleStruct, ssOffset);
|
||||
uint8_t fullCorner = animType - eStyleAnimType_Corner_TopLeft;
|
||||
Corner fullCorner = Corner(animType - eStyleAnimType_Corner_TopLeft);
|
||||
const nsStyleCoord &horiz =
|
||||
corners.Get(NS_FULL_TO_HALF_CORNER(fullCorner, false));
|
||||
corners.Get(FullToHalfCorner(fullCorner, false));
|
||||
const nsStyleCoord &vert =
|
||||
corners.Get(NS_FULL_TO_HALF_CORNER(fullCorner, true));
|
||||
corners.Get(FullToHalfCorner(fullCorner, true));
|
||||
nsAutoPtr<nsCSSValuePair> pair(new nsCSSValuePair);
|
||||
if (!StyleCoordToCSSValue(horiz, pair->mXValue) ||
|
||||
!StyleCoordToCSSValue(vert, pair->mYValue)) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue