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

Guard inheriting font-size with what we actually need.

Browse source 
MozReview-Commit-ID: C4QaV5cNLh5
Signed-off-by: Emilio Cobos Álvarez <emilio@crisal.io>
This commit is contained in:
Emilio Cobos Álvarez 2017-05-01 21:22:28 +02:00
parent e92a79619e
commit 17ec634665
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/style/properties/properties.mako.rs
View file

@ -2535,13 +2535,16 @@ pub fn apply_declarations<'a, F, I>(device: &Device,
&mut cacheable, &mut cacheable,
&mut cascade_info, &mut cascade_info,
error_reporter); error_reporter);
} else { % if product == "gecko":
// Font size must be explicitly inherited to handle keyword // Font size must be explicitly inherited to handle lang changes and
// sizes and scriptlevel // scriptlevel changes.
} else if seen.contains(LonghandId::XLang) ||
seen.contains(LonghandId::MozScriptLevel) ||
font_family.is_some() {
let discriminant = LonghandId::FontSize as usize; let discriminant = LonghandId::FontSize as usize;
let size = PropertyDeclaration::CSSWideKeyword( let size = PropertyDeclaration::CSSWideKeyword(
LonghandId::FontSize, CSSWideKeyword::Inherit LonghandId::FontSize, CSSWideKeyword::Inherit);
);
(CASCADE_PROPERTY[discriminant])(&size, (CASCADE_PROPERTY[discriminant])(&size,
inherited_style, inherited_style,
default_style, default_style,
@ -2549,6 +2552,7 @@ pub fn apply_declarations<'a, F, I>(device: &Device,
&mut cacheable, &mut cacheable,
&mut cascade_info, &mut cascade_info,
error_reporter); error_reporter);
% endif
} }
% endif % endif
% endfor % endfor