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

Make use of existing helper for font-stretch

Browse source
This commit is contained in:
Ravi Shankar 2016-10-07 20:55:26 +05:30
parent 710157c617
commit e7a9e46c27
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
components/style/properties/gecko.mako.rs
View file

@ -212,14 +212,15 @@ def set_gecko_property(ffi_name, expr):
return "self.gecko.%s = %s;" % (ffi_name, expr) return "self.gecko.%s = %s;" % (ffi_name, expr)
%> %>
<%def name="impl_keyword_setter(ident, gecko_ffi_name, keyword)"> <%def name="impl_keyword_setter(ident, gecko_ffi_name, keyword, cast_type='u8')">
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) { pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
use properties::longhands::${ident}::computed_value::T as Keyword; use properties::longhands::${ident}::computed_value::T as Keyword;
// FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts // FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts
let result = match v { let result = match v {
% for value in keyword.values_for('gecko'): % for value in keyword.values_for('gecko'):
Keyword::${to_rust_ident(value)} => structs::${keyword.gecko_constant(value)} ${keyword.maybe_cast("u8")}, Keyword::${to_rust_ident(value)} =>
structs::${keyword.gecko_constant(value)} ${keyword.maybe_cast(cast_type)},
% endfor % endfor
}; };
${set_gecko_property(gecko_ffi_name, "result")} ${set_gecko_property(gecko_ffi_name, "result")}
@ -278,8 +279,8 @@ def set_gecko_property(ffi_name, expr):
} }
</%def> </%def>
<%def name="impl_keyword(ident, gecko_ffi_name, keyword, need_clone)"> <%def name="impl_keyword(ident, gecko_ffi_name, keyword, need_clone, **kwargs)">
<%call expr="impl_keyword_setter(ident, gecko_ffi_name, keyword)"></%call> <%call expr="impl_keyword_setter(ident, gecko_ffi_name, keyword, **kwargs)"></%call>
<%call expr="impl_simple_copy(ident, gecko_ffi_name)"></%call> <%call expr="impl_simple_copy(ident, gecko_ffi_name)"></%call>
%if need_clone: %if need_clone:
<%call expr="impl_keyword_clone(ident, gecko_ffi_name, keyword)"></%call> <%call expr="impl_keyword_clone(ident, gecko_ffi_name, keyword)"></%call>
@ -790,23 +791,13 @@ fn static_assert() {
Au(self.gecko.mSize) Au(self.gecko.mSize)
} }
pub fn set_font_stretch(&mut self, v: longhands::font_stretch::computed_value::T) { <% stretch_keyword = Keyword("font-stretch",
use computed_values::font_stretch::T; "normal ultra-condensed extra-condensed condensed " +
"semi-condensed semi-expanded expanded " +
"extra-expanded ultra-expanded",
gecko_constant_prefix='NS_FONT_STRETCH') %>
self.gecko.mFont.stretch = match v { ${impl_keyword('font_stretch', 'mFont.stretch', stretch_keyword, need_clone=False, cast_type='i16')}
T::normal => structs::NS_FONT_STRETCH_NORMAL as i16,
T::ultra_condensed => structs::NS_FONT_STRETCH_ULTRA_CONDENSED as i16,
T::extra_condensed => structs::NS_FONT_STRETCH_EXTRA_CONDENSED as i16,
T::condensed => structs::NS_FONT_STRETCH_CONDENSED as i16,
T::semi_condensed => structs::NS_FONT_STRETCH_SEMI_CONDENSED as i16,
T::semi_expanded => structs::NS_FONT_STRETCH_SEMI_EXPANDED as i16,
T::expanded => structs::NS_FONT_STRETCH_EXPANDED as i16,
T::extra_expanded => structs::NS_FONT_STRETCH_EXTRA_EXPANDED as i16,
T::ultra_expanded => structs::NS_FONT_STRETCH_ULTRA_EXPANDED as i16,
};
}
${impl_simple_copy('font_stretch', 'mFont.stretch')}
pub fn set_font_weight(&mut self, v: longhands::font_weight::computed_value::T) { pub fn set_font_weight(&mut self, v: longhands::font_weight::computed_value::T) {
self.gecko.mFont.weight = v as u16; self.gecko.mFont.weight = v as u16;