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

Give StyleBuilder separate inherited styles for inherited and non-inherited structs.

Browse source 
This is needed for ::first-line, which causes its kids to inherit different properties from different places.

Part 2 of Gecko bug 1382806.  r=emilio
This commit is contained in:
Boris Zbarsky 2017-07-26 13:40:42 -04:00
parent 648c0a3d0b
commit f991b76535
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/properties/properties.mako.rs
View file

@ -2470,6 +2470,11 @@ pub struct StyleBuilder<'a> {
/// `parent_style.unwrap_or(device.default_computed_values())`. /// `parent_style.unwrap_or(device.default_computed_values())`.
inherited_style: &'a ComputedValues, inherited_style: &'a ComputedValues,
/// The style we're inheriting from for properties that don't inherit from
/// ::first-line. This is the same as inherited_style, unless
/// inherited_style is a ::first-line style.
inherited_style_ignoring_first_line: &'a ComputedValues,
/// The style we're getting reset structs from. /// The style we're getting reset structs from.
reset_style: &'a ComputedValues, reset_style: &'a ComputedValues,
@ -2528,6 +2533,7 @@ impl<'a> StyleBuilder<'a> {
device, device,
parent_style, parent_style,
inherited_style, inherited_style,
inherited_style_ignoring_first_line: inherited_style,
reset_style, reset_style,
pseudo, pseudo,
rules, rules,
@ -2560,6 +2566,7 @@ impl<'a> StyleBuilder<'a> {
device, device,
parent_style, parent_style,
inherited_style, inherited_style,
inherited_style_ignoring_first_line: inherited_style,
reset_style, reset_style,
pseudo, pseudo,
rules: None, // FIXME(emilio): Dubious... rules: None, // FIXME(emilio): Dubious...
@ -2581,8 +2588,13 @@ impl<'a> StyleBuilder<'a> {
/// Inherit `${property.ident}` from our parent style. /// Inherit `${property.ident}` from our parent style.
#[allow(non_snake_case)] #[allow(non_snake_case)]
pub fn inherit_${property.ident}(&mut self) { pub fn inherit_${property.ident}(&mut self) {
% if property.style_struct.inherited:
let inherited_struct = let inherited_struct =
self.inherited_style.get_${property.style_struct.name_lower}(); self.inherited_style.get_${property.style_struct.name_lower}();
% else:
let inherited_struct =
self.inherited_style_ignoring_first_line.get_${property.style_struct.name_lower}();
% endif
self.${property.style_struct.ident}.mutate() self.${property.style_struct.ident}.mutate()
.copy_${property.ident}_from( .copy_${property.ident}_from(
inherited_struct, inherited_struct,
@ -2776,7 +2788,11 @@ impl<'a> StyleBuilder<'a> {
/// next-best thing and call them `parent_${style_struct.name_lower}` /// next-best thing and call them `parent_${style_struct.name_lower}`
/// instead. /// instead.
pub fn get_parent_${style_struct.name_lower}(&self) -> &style_structs::${style_struct.name} { pub fn get_parent_${style_struct.name_lower}(&self) -> &style_structs::${style_struct.name} {
% if style_struct.inherited:
self.inherited_style.get_${style_struct.name_lower}() self.inherited_style.get_${style_struct.name_lower}()
% else:
self.inherited_style_ignoring_first_line.get_${style_struct.name_lower}()
% endif
} }
% endfor % endfor
} }