mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Auto merge of #16682 - emilio:font-size-inherit, r=bholley
Guard inheriting font-size with what we actually need. See https://bugzilla.mozilla.org/show_bug.cgi?id=1361126 <!-- 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/16682) <!-- Reviewable:end -->
This commit is contained in:
commit
4f13bc3829
1 changed files with 9 additions and 5 deletions
|
@ -2535,13 +2535,16 @@ pub fn apply_declarations<'a, F, I>(device: &Device,
|
|||
&mut cacheable,
|
||||
&mut cascade_info,
|
||||
error_reporter);
|
||||
} else {
|
||||
// Font size must be explicitly inherited to handle keyword
|
||||
// sizes and scriptlevel
|
||||
% if product == "gecko":
|
||||
// Font size must be explicitly inherited to handle lang changes and
|
||||
// scriptlevel changes.
|
||||
} else if seen.contains(LonghandId::XLang) ||
|
||||
seen.contains(LonghandId::MozScriptLevel) ||
|
||||
font_family.is_some() {
|
||||
let discriminant = LonghandId::FontSize as usize;
|
||||
let size = PropertyDeclaration::CSSWideKeyword(
|
||||
LonghandId::FontSize, CSSWideKeyword::Inherit
|
||||
);
|
||||
LonghandId::FontSize, CSSWideKeyword::Inherit);
|
||||
|
||||
(CASCADE_PROPERTY[discriminant])(&size,
|
||||
inherited_style,
|
||||
default_style,
|
||||
|
@ -2549,6 +2552,7 @@ pub fn apply_declarations<'a, F, I>(device: &Device,
|
|||
&mut cacheable,
|
||||
&mut cascade_info,
|
||||
error_reporter);
|
||||
% endif
|
||||
}
|
||||
% endif
|
||||
% endfor
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue