servo: Merge #18399 - stylo: Overflow fixes (from Manishearth:stylo-fuzzfix); r=emilio

r=emilio https://bugzilla.mozilla.org/show_bug.cgi?id=1397363 , https://bugzilla.mozilla.org/show_bug.cgi?id=1397439

Source-Repo: https://github.com/servo/servo
Source-Revision: 812cac78f0f4dba6063ba31d79b24667c5782b13

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 08a1b1b8f215f5373489fd55fdc651551237bff4
This commit is contained in:
Manish Goregaokar 2017-09-06 17:47:28 -05:00
Родитель 6b381a4cf5
Коммит 897456d68a
3 изменённых файлов: 6 добавлений и 10 удалений

Просмотреть файл

@ -2341,7 +2341,7 @@ fn static_assert() {
pub fn calculate_script_level_size(&self, parent: &Self, device: &Device) -> (Au, Au) {
use std::cmp;
let delta = self.gecko.mScriptLevel - parent.gecko.mScriptLevel;
let delta = self.gecko.mScriptLevel.saturating_sub(parent.gecko.mScriptLevel);
let parent_size = Au(parent.gecko.mSize);
let parent_unconstrained_size = Au(parent.gecko.mScriptUnconstrainedSize);

Просмотреть файл

@ -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
)
}