зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1808811 - Animate the 'normal' value of font-style as 'oblique 0deg'. r=firefox-style-system-reviewers,emilio
This matches what the spec[1] says for font-style: > Animation type: by computed value type; normal animates as oblique 0deg A bunch of WPT tests for font-style animation are landing in https://github.com/web-platform-tests/wpt/pull/37570. Current Gecko passes 66/129 of the testcases there; with this patch applied it passes all the tests. [1] https://drafts.csswg.org/css-fonts-4/#font-style-prop Differential Revision: https://phabricator.services.mozilla.com/D166128
This commit is contained in:
Родитель
3ed20ecd38
Коммит
1be379c873
|
@ -418,7 +418,7 @@ var gFromToBundles = [
|
|||
new AnimTestcaseFromTo("italic", "inherit", { toComp: "normal" }),
|
||||
new AnimTestcaseFromTo("normal", "italic"),
|
||||
new AnimTestcaseFromTo("italic", "oblique"),
|
||||
new AnimTestcaseFromTo("oblique", "normal"),
|
||||
new AnimTestcaseFromTo("oblique", "normal", { midComp: "oblique 7deg" }),
|
||||
]),
|
||||
new TestcaseBundle(gPropList.font_variant, [
|
||||
new AnimTestcaseFromTo("inherit", "small-caps", { fromComp: "normal" }),
|
||||
|
|
|
@ -440,6 +440,7 @@ var skipped_transitionable_properties = [
|
|||
"border-image-outset",
|
||||
"border-image-slice",
|
||||
"border-image-width",
|
||||
"font-style", // Tests being added in https://github.com/web-platform-tests/wpt/pull/37570
|
||||
"grid-template-columns",
|
||||
"grid-template-rows",
|
||||
]
|
||||
|
|
|
@ -960,7 +960,10 @@ impl ToAnimatedValue for FontStyle {
|
|||
#[inline]
|
||||
fn to_animated_value(self) -> Self::AnimatedValue {
|
||||
if self == Self::NORMAL {
|
||||
return generics::FontStyle::Normal;
|
||||
// This allows us to animate between normal and oblique values. Per spec,
|
||||
// https://drafts.csswg.org/css-fonts-4/#font-style-prop:
|
||||
// Animation type: by computed value type; 'normal' animates as 'oblique 0deg'
|
||||
return generics::FontStyle::Oblique(Angle::from_degrees(0.0))
|
||||
}
|
||||
if self == Self::ITALIC {
|
||||
return generics::FontStyle::Italic;
|
||||
|
@ -973,7 +976,13 @@ impl ToAnimatedValue for FontStyle {
|
|||
match animated {
|
||||
generics::FontStyle::Normal => Self::NORMAL,
|
||||
generics::FontStyle::Italic => Self::ITALIC,
|
||||
generics::FontStyle::Oblique(ref angle) => Self::oblique(angle.degrees()),
|
||||
generics::FontStyle::Oblique(ref angle) =>
|
||||
if angle.degrees() == 0.0 {
|
||||
// Reverse the conversion done in to_animated_value()
|
||||
Self::NORMAL
|
||||
} else {
|
||||
Self::oblique(angle.degrees())
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче