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

stylo: Add basic system font support, use for font-size and font-family

Browse source
This commit is contained in:
Manish Goregaokar 2017-03-21 20:38:12 -07:00 • committed by Manish Goregaokar
parent 2b5c17c43a
commit c1c4c8fa59
9 changed files with 261 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ports/geckolib/glue.rs
View file

@ -1928,7 +1928,7 @@ pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeLis
let default_values = data.default_computed_values();
let metrics = get_metrics_provider_for_product();
let context = Context {
let mut context = Context {
is_root_element: false,
device: &data.stylist.device,
inherited_style: parent_style.unwrap_or(default_values),
@ -1956,7 +1956,7 @@ pub extern "C" fn Servo_GetComputedKeyframeValues(keyframes: RawGeckoKeyframeLis
.filter_map(|&(ref decl, imp)| {
if imp == Importance::Normal {
let property = TransitionProperty::from_declaration(decl);
let animation = AnimationValue::from_declaration(decl, &context, default_values);
let animation = AnimationValue::from_declaration(decl, &mut context, default_values);
debug_assert!(property.is_none() == animation.is_none(),
"The failure condition of TransitionProperty::from_declaration \
and AnimationValue::from_declaration should be the same");