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

replacing custom fmin function with standard f32.min in components/layout/display_list_builder.rs

Browse source
This commit is contained in:
askalski 2016-01-16 16:39:48 +01:00
parent 679d1280dd
commit cf107bca4f
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
components/layout/display_list_builder.rs
View file

@ -1928,22 +1928,14 @@ struct StopRun {
stop_count: usize,
}
fn fmin(a: f32, b: f32) -> f32 {
if a < b {
a
} else {
b
}
}
fn position_to_offset(position: LengthOrPercentage, Au(total_length): Au) -> f32 {
match position {
LengthOrPercentage::Length(Au(length)) => {
fmin(1.0, (length as f32) / (total_length as f32))
(1.0f32).min(length as f32 / total_length as f32)
}
LengthOrPercentage::Percentage(percentage) => percentage as f32,
LengthOrPercentage::Calc(calc) =>
fmin(1.0, calc.percentage() + (calc.length().0 as f32) / (total_length as f32)),
(1.0f32).min(calc.percentage() + (calc.length().0 as f32) / (total_length as f32)),
}
}