Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Fix clamping on animations for fort-style.

Browse source 
Bug: 1455358
Reviewed-by: xidorn
MozReview-Commit-ID: Awyub0dMOmq
This commit is contained in:
Emilio Cobos Álvarez 2018-04-19 21:40:25 +02:00
parent 737501153b
commit 0a8518b452
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
5 changed files with 37 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
components/style/values/specified/angle.rs
View file

@ -110,8 +110,7 @@ impl Angle {
/// Returns the amount of degrees this angle represents.
#[inline]
pub fn degrees(self) -> f32 {
use std::f32::consts::PI;
self.radians() * 360. / (2. * PI)
self.value.degrees()
}
/// Returns `0deg`.

6
components/style/values/specified/font.rs
View file

@ -19,7 +19,7 @@ use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
use values::CustomIdent;
use values::computed::{Angle as ComputedAngle, Percentage as ComputedPercentage};
use values::computed::{font as computed, Context, Length, NonNegativeLength, ToComputedValue};
use values::computed::font::{FamilyName, FontFamilyList, SingleFontFamily};
use values::computed::font::{FamilyName, FontFamilyList, FontStyleAngle, SingleFontFamily};
use values::generics::NonNegative;
use values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag};
use values::generics::font::{KeywordInfo as GenericKeywordInfo, KeywordSize, VariationValue};
@ -241,7 +241,7 @@ impl ToComputedValue for SpecifiedFontStyle {
generics::FontStyle::Normal => generics::FontStyle::Normal,
generics::FontStyle::Italic => generics::FontStyle::Italic,
generics::FontStyle::Oblique(ref angle) => {
generics::FontStyle::Oblique(Self::compute_angle(angle))
generics::FontStyle::Oblique(FontStyleAngle(Self::compute_angle(angle)))
}
}
}
@ -251,7 +251,7 @@ impl ToComputedValue for SpecifiedFontStyle {
generics::FontStyle::Normal => generics::FontStyle::Normal,
generics::FontStyle::Italic => generics::FontStyle::Italic,
generics::FontStyle::Oblique(ref angle) => {
generics::FontStyle::Oblique(Angle::from_computed_value(angle))
generics::FontStyle::Oblique(Angle::from_computed_value(&angle.0))
}
}
}