Skip to content
Permalink
Browse files

stylo: Clamp Au on accumulation

  • Loading branch information
Manishearth committed Sep 6, 2017
1 parent 5e321ca commit c063ff88de6332f0fc687c4a7495cd12b205e67a
Showing with 5 additions and 9 deletions.
  1. +1 −1 components/style/values/animated/mod.rs
  2. +4 −8 components/style/values/specified/length.rs
@@ -162,7 +162,7 @@ where
impl Animate for Au {
#[inline]
fn animate(&self, other: &Self, procedure: Procedure) -> Result<Self, ()> {
Ok(Au(self.0.animate(&other.0, procedure)?))
Ok(Au::new(self.0.animate(&other.0, procedure)?))
}
}

@@ -6,7 +6,7 @@
//!
//! [length]: https://drafts.csswg.org/css-values/#lengths

use app_units::Au;
use app_units::{Au, MAX_AU, MIN_AU};
use cssparser::{Parser, Token, BasicParseError};
use euclid::Size2D;
use font_metrics::FontMetricsQueryResult;
@@ -236,16 +236,12 @@ impl CharacterWidth {
}
}

/// Same as Gecko
const ABSOLUTE_LENGTH_MAX: i32 = (1 << 30);
const ABSOLUTE_LENGTH_MIN: i32 = - (1 << 30);

/// Helper to convert a floating point length to application units
fn to_au_round(length: CSSFloat, au_per_unit: CSSFloat) -> Au {
Au(
(length * au_per_unit)
.min(ABSOLUTE_LENGTH_MAX as f32)
.max(ABSOLUTE_LENGTH_MIN as f32)
((length * au_per_unit) as f64)
.min(MAX_AU.0 as f64)
.max(MIN_AU.0 as f64)
.round() as i32
)
}

0 comments on commit c063ff8

Please sign in to comment.
You can’t perform that action at this time.