From 12ad70eb229344422c860594316aceb895417c18 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Tue, 1 Oct 2019 00:38:44 +0000 Subject: [PATCH] servo: Merge #13751 - Add support for 'font-kerning' in geckolib (from joewalker:font-kerning); r=Manishearth Add support for 'font-kerning' in geckolib These changes fix #13667 $ ./mach build -d It looks like you passed an unrecognized argument into mach. $ ./mach test-tidy It looks like you are trying to run an unknown mach command: test-tidy I'm clearly doing something wrong here, but I'm not sure what - [x] These changes do not require tests because "[For stylo it's okay to not have tests since many of the reftests fail due to unrelated reasons](https://github.com/servo/servo/pull/13570#issuecomment-251354116)" :) Source-Repo: https://github.com/servo/servo Source-Revision: b94f074b52584f467c61ee5d1851b1b4557ccfcb UltraBlame original commit: b1a91e2daf1e2b591e45b0931083619c89571bb1 --- servo/components/style/properties/gecko.mako.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/servo/components/style/properties/gecko.mako.rs b/servo/components/style/properties/gecko.mako.rs index 2cc12d70f08b0..ec07133bfe3a9 100644 --- a/servo/components/style/properties/gecko.mako.rs +++ b/servo/components/style/properties/gecko.mako.rs @@ -449,7 +449,7 @@ impl Debug for ${style_struct.gecko_struct_name} { # These are currently being shuffled to a different style struct on the gecko side. force_stub += ["backface-visibility", "transform-box", "transform-style"] # These live in an nsFont member in Gecko. Should be straightforward to do manually. - force_stub += ["font-kerning", "font-variant"] + force_stub += ["font-variant"] # These have unusual representations in gecko. force_stub += ["list-style-type"] # In a nsTArray, have to be done manually, but probably not too much work @@ -739,7 +739,7 @@ fn static_assert() { <%self:impl_trait style_struct_name="Font" - skip_longhands="font-family font-stretch font-style font-size font-weight" + skip_longhands="font-family font-kerning font-stretch font-style font-size font-weight" skip_additionals="*"> pub fn set_font_family(&mut self, v: longhands::font_family::computed_value::T) { @@ -790,6 +790,11 @@ fn static_assert() { Au(self.gecko.mSize) } + <% kerning_keyword = Keyword("font-kerning", "auto normal none", + gecko_constant_prefix='NS_FONT_KERNING') %> + + ${impl_keyword('font_kerning', 'mFont.kerning', kerning_keyword, need_clone=False)} + <% stretch_keyword = Keyword("font-stretch", "normal ultra-condensed extra-condensed condensed " + "semi-condensed semi-expanded expanded " +