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

Auto merge of #13636 - Wafflespeanut:properties, r=Manishearth

Browse source 
Add 'image-rendering' support and some cleanup

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build-geckolib` does not report any errors
- [x] `./mach test-tidy` does not report any errors

<!-- Either: -->
- [x] These changes have been tested manually

![screenshot](https://cloud.githubusercontent.com/assets/6691262/19195866/eb46ffce-8cd0-11e6-8642-a9525da8bf38.png)

r? @Manishearth

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13636)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-10-07 16:30:29 -05:00 • committed by GitHub
commit a25e0670b3
5 changed files with 57 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -213,14 +213,15 @@ def set_gecko_property(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)]
pub fn set_${ident}(&mut self, v: longhands::${ident}::computed_value::T) {
use properties::longhands::${ident}::computed_value::T as Keyword;
// FIXME(bholley): Align binary representations and ditch |match| for cast + static_asserts
let result = match v {
% 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
};
${set_gecko_property(gecko_ffi_name, "result")}
@ -279,8 +280,8 @@ def set_gecko_property(ffi_name, expr):
}
</%def>
<%def name="impl_keyword(ident, gecko_ffi_name, keyword, need_clone)">
<%call expr="impl_keyword_setter(ident, gecko_ffi_name, keyword)"></%call>
<%def name="impl_keyword(ident, gecko_ffi_name, keyword, need_clone, **kwargs)">
<%call expr="impl_keyword_setter(ident, gecko_ffi_name, keyword, **kwargs)"></%call>
<%call expr="impl_simple_copy(ident, gecko_ffi_name)"></%call>
%if need_clone:
<%call expr="impl_keyword_clone(ident, gecko_ffi_name, keyword)"></%call>
@ -791,23 +792,13 @@ fn static_assert() {
Au(self.gecko.mSize)
}
pub fn set_font_stretch(&mut self, v: longhands::font_stretch::computed_value::T) {
use computed_values::font_stretch::T;
<% stretch_keyword = Keyword("font-stretch",
"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 {
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')}
${impl_keyword('font_stretch', 'mFont.stretch', stretch_keyword, need_clone=False, cast_type='i16')}
pub fn set_font_weight(&mut self, v: longhands::font_weight::computed_value::T) {
self.gecko.mFont.weight = v as u16;
@ -1446,6 +1437,17 @@ fn static_assert() {
</%self:impl_trait>
<%self:impl_trait style_struct_name="InheritedBox"
skip_longhands="image-rendering">
<% render_keyword = Keyword("image-rendering",
"auto optimizequality optimizespeed crispedges") %>
${impl_keyword('image_rendering', 'mImageRendering', render_keyword, need_clone=False)}
</%self:impl_trait>
<%self:impl_trait style_struct_name="InheritedText"
skip_longhands="text-align text-shadow line-height letter-spacing word-spacing">