Handle BORDER_STYLE_MASK.

Gecko uses the higher bits of certain border-style-like properties to store other things.
This duplicates the logic in Gecko's {Get,Set}BorderStyle and similar.
This commit is contained in:
Bobby Holley 2016-04-20 13:45:14 -07:00
parent ca7e80e50c
commit 611a2f0991

View file

@ -118,16 +118,35 @@ pub struct ${style_struct.gecko_struct_name};
} }
</%def> </%def>
<%!
def is_border_style_masked(ffi_name):
return ffi_name.split("[")[0] in ["mBorderStyle", "mOutlineStyle", "mTextDecorationStyle"]
def get_gecko_property(ffi_name):
if is_border_style_masked(ffi_name):
return "(self.gecko.%s & (gecko_style_structs::BORDER_STYLE_MASK as u8))" % ffi_name
else:
return "self.gecko.%s" % ffi_name
def set_gecko_property(ffi_name, expr):
if is_border_style_masked(ffi_name):
return "self.gecko.%s &= !(gecko_style_structs::BORDER_STYLE_MASK as u8);" % ffi_name + \
"self.gecko.%s |= %s as u8;" % (ffi_name, expr)
else:
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)">
fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) { fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
use gecko_style_structs as gss; use gecko_style_structs as gss;
use style::properties::longhands::${ident}::computed_value::T as Keyword; use style::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
self.gecko.${gecko_ffi_name} = 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)} => gss::${keyword.gecko_constant(value)} as u8, Keyword::${to_rust_ident(value)} => gss::${keyword.gecko_constant(value)} as u8,
% endfor % endfor
}; };
${set_gecko_property(gecko_ffi_name, "result")}
} }
</%def> </%def>
@ -136,7 +155,7 @@ pub struct ${style_struct.gecko_struct_name};
use gecko_style_structs as gss; use gecko_style_structs as gss;
use style::properties::longhands::${ident}::computed_value::T as Keyword; use style::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
match self.gecko.${gecko_ffi_name} as u32 { match ${get_gecko_property(gecko_ffi_name)} as u32 {
% for value in keyword.values_for('gecko'): % for value in keyword.values_for('gecko'):
gss::${keyword.gecko_constant(value)} => Keyword::${to_rust_ident(value)}, gss::${keyword.gecko_constant(value)} => Keyword::${to_rust_ident(value)},
% endfor % endfor