Skip to content

Commit

Permalink
servo: Merge #13751 - Add support for 'font-kerning' in geckolib (fro…
Browse files Browse the repository at this point in the history
…m 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](servo/servo#13570 (comment))" :)

Source-Repo: https://github.com/servo/servo
Source-Revision: b94f074b52584f467c61ee5d1851b1b4557ccfcb

UltraBlame original commit: b1a91e2daf1e2b591e45b0931083619c89571bb1
  • Loading branch information
marco-c committed Oct 1, 2019
1 parent 43efa53 commit 12ad70e
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions servo/components/style/properties/gecko.mako.rs
Expand Up @@ -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
Expand Down Expand Up @@ -739,7 +739,7 @@ fn static_assert() {
</%self:impl_trait>

<%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) {
Expand Down Expand Up @@ -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 " +
Expand Down

0 comments on commit 12ad70e

Please sign in to comment.