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

Serialize font to "" on some nondefault properties

Browse source 
Fixes font shorthand serialization so that it serializes to "" when
certain subproperties of the font shorthand are set to non-default
values. These subproperties are:
- font-size-adjust
- font-kerning
- font-variant-caps
- font-variant-position
- font-language-override

Additionally, enable the above subproperties in the tests.
This commit is contained in:
Zach Ploskey 2017-03-02 10:39:44 -08:00
parent a2c33ac6e6
commit cbaa6e262c
1 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

48
components/style/properties/shorthand/font.mako.rs
View file

@ -6,18 +6,18 @@
<%helpers:shorthand name="font" sub_properties="font-style font-variant font-weight font-stretch <%helpers:shorthand name="font" sub_properties="font-style font-variant font-weight font-stretch
font-size line-height font-family font-size line-height font-family
${'font-size-adjust' if product == 'gecko' else ''} ${'font-size-adjust' if product == 'gecko' or data.testing else ''}
${'font-kerning' if product == 'gecko' else ''} ${'font-kerning' if product == 'gecko' or data.testing else ''}
${'font-variant-caps' if product == 'gecko' else ''} ${'font-variant-caps' if product == 'gecko' or data.testing else ''}
${'font-variant-position' if product == 'gecko' else ''} ${'font-variant-position' if product == 'gecko' or data.testing else ''}
${'font-language-override' if product == 'none' else ''}" ${'font-language-override' if data.testing else ''}"
spec="https://drafts.csswg.org/css-fonts-3/#propdef-font"> spec="https://drafts.csswg.org/css-fonts-3/#propdef-font">
use properties::longhands::{font_style, font_variant, font_weight, font_stretch}; use properties::longhands::{font_style, font_variant, font_weight, font_stretch};
use properties::longhands::{font_size, line_height}; use properties::longhands::{font_size, line_height};
% if product == "gecko": % if product == "gecko" or data.testing:
use properties::longhands::{font_size_adjust, font_kerning, font_variant_caps, font_variant_position}; use properties::longhands::{font_size_adjust, font_kerning, font_variant_caps, font_variant_position};
% endif % endif
% if product == "none": % if data.testing:
use properties::longhands::font_language_override; use properties::longhands::font_language_override;
% endif % endif
use properties::longhands::font_family::SpecifiedValue as FontFamily; use properties::longhands::font_family::SpecifiedValue as FontFamily;
@ -83,12 +83,12 @@
% endfor % endfor
line_height: unwrap_or_initial!(line_height), line_height: unwrap_or_initial!(line_height),
font_family: family, font_family: family,
% if product == "gecko": % if product == "gecko" or data.testing:
% for name in "size_adjust kerning variant_caps variant_position".split(): % for name in "size_adjust kerning variant_caps variant_position".split():
font_${name}: font_${name}::get_initial_specified_value(), font_${name}: font_${name}::get_initial_specified_value(),
% endfor % endfor
% endif % endif
% if product == "none": % if data.testing:
font_language_override: font_language_override::get_initial_specified_value(), font_language_override: font_language_override::get_initial_specified_value(),
% endif % endif
}) })
@ -97,16 +97,28 @@
// This may be a bit off, unsure, possibly needs changes // This may be a bit off, unsure, possibly needs changes
impl<'a> ToCss for LonghandsToSerialize<'a> { impl<'a> ToCss for LonghandsToSerialize<'a> {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
self.font_style.to_css(dest)?;
dest.write_str(" ")?; % if product == "gecko" or data.testing:
self.font_variant.to_css(dest)?; % for name in "size_adjust kerning variant_caps variant_position".split():
dest.write_str(" ")?; if self.font_${name} != &font_${name}::get_initial_specified_value() {
self.font_weight.to_css(dest)?; return Ok(());
dest.write_str(" ")?; }
self.font_stretch.to_css(dest)?; % endfor
% endif
% if data.testing:
if self.font_language_override != &font_language_override::get_initial_specified_value() {
return Ok(());
}
% endif
% for name in "style variant weight stretch".split():
self.font_${name}.to_css(dest)?;
dest.write_str(" ")?; dest.write_str(" ")?;
% endfor
self.font_size.to_css(dest)?; self.font_size.to_css(dest)?;
match *self.line_height { match *self.line_height {
line_height::SpecifiedValue::Normal => {}, line_height::SpecifiedValue::Normal => {},
_ => { _ => {
@ -116,7 +128,9 @@
} }
dest.write_str(" ")?; dest.write_str(" ")?;
self.font_family.to_css(dest) self.font_family.to_css(dest)?;
Ok(())
} }
} }
</%helpers:shorthand> </%helpers:shorthand>