Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 21:50:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17809 - Manishearth:stylo-system-anim, r=hiikezoe

Browse source 
Stop asserting when cached system font changes

It may change during animation

fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1382672

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17809)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-20 16:07:51 -07:00 • committed by GitHub
commit 4616f4ae77
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/properties/longhand/font.mako.rs
View file

@ -2489,11 +2489,13 @@ ${helpers.single_keyword("-moz-math-variant",
/// Must be called before attempting to compute a system font
/// specified value
pub fn resolve_system_font(system: SystemFont, context: &mut Context) {
if context.cached_system_font.is_none() {
// Checking if context.cached_system_font.is_none() isn't enough,
// if animating from one system font to another the cached system font
// may change
if Some(system) != context.cached_system_font.as_ref().map(|x| x.system_font) {
let computed = system.to_computed_value(context);
context.cached_system_font = Some(computed);
}
debug_assert!(system == context.cached_system_font.as_ref().unwrap().system_font)
}
#[derive(Clone, Debug)]