KotJohansson/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 14:54:25 +00:00
Code Issues Projects Releases Wiki Activity

Issue #1781 - Part 2: Fix animation interpolation for stroke-dashoffset.

Browse Source 
Since we have calc() and floats working now, this is a trivial fix.
This commit is contained in:
Moonchild
2021-06-12 11:36:16 +00:00
committed by roytam1
parent 15a322effa
commit a149af1199
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/style/StyleAnimationValue.cpp
+12 -2
View File
@@ -63,11 +63,15 @@ GetCommonUnit(nsCSSPropertyID aProperty,
StyleAnimationValue::Unit aSecondUnit)
{
if (aFirstUnit != aSecondUnit) {
bool numberAsPixel =
nsCSSProps::PropHasFlags(aProperty, CSS_PROPERTY_NUMBERS_ARE_PIXELS);
if (nsCSSProps::PropHasFlags(aProperty, CSS_PROPERTY_STORES_CALC) &&
(aFirstUnit == StyleAnimationValue::eUnit_Coord ||
((aFirstUnit == StyleAnimationValue::eUnit_Float && numberAsPixel) ||
aFirstUnit == StyleAnimationValue::eUnit_Coord ||
aFirstUnit == StyleAnimationValue::eUnit_Percent ||
aFirstUnit == StyleAnimationValue::eUnit_Calc) &&
(aSecondUnit == StyleAnimationValue::eUnit_Coord ||
((aSecondUnit == StyleAnimationValue::eUnit_Float && numberAsPixel) ||
aSecondUnit == StyleAnimationValue::eUnit_Coord ||
aSecondUnit == StyleAnimationValue::eUnit_Percent ||
aSecondUnit == StyleAnimationValue::eUnit_Calc)) {
// We can use calc() as the common unit.
@@ -354,6 +358,12 @@ ExtractCalcValue(const StyleAnimationValue& aValue)
result.mHasPercent = true;
return result;
}
if (aValue.GetUnit() == StyleAnimationValue::eUnit_Float) {
result.mLength = aValue.GetFloatValue();
result.mPercent = 0.0f;
result.mHasPercent = false;
return result;
}
MOZ_ASSERT(aValue.GetUnit() == StyleAnimationValue::eUnit_Calc,
"unexpected unit");
nsCSSValue *val = aValue.GetCSSValueValue();
layout/style/nsCSSPropList.h
+2 -1
View File
@@ -3814,7 +3814,8 @@ CSS_PROP_SVG(
stroke_dashoffset,
StrokeDashoffset,
CSS_PROPERTY_PARSE_VALUE |
CSS_PROPERTY_NUMBERS_ARE_PIXELS,
CSS_PROPERTY_NUMBERS_ARE_PIXELS |
CSS_PROPERTY_STORES_CALC,
"",
VARIANT_HLPN | VARIANT_OPENTYPE_SVG_KEYWORD | VARIANT_CALC,
kStrokeContextValueKTable,