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

Remove custom property declarations in dependency cycles.

Browse source
This commit is contained in:
Simon Sapin 2015-07-22 20:42:04 +02:00
parent 09e60beb78
commit 65d4ecaa39
3 changed files with 59 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6174,8 +6174,8 @@ fn cascade_with_cached_declarations(
% for style_struct in STYLE_STRUCTS:
${style_struct.ident}: style_${style_struct.ident},
% endfor
custom_properties: custom_properties
.map(Arc::new).or_else(|| parent_style.custom_properties.clone()),
custom_properties: ::custom_properties::finish_cascade(
custom_properties, &parent_style.custom_properties),
shareable: shareable,
root_font_size: parent_style.root_font_size,
}
@ -6451,8 +6451,8 @@ pub fn cascade(viewport_size: Size2D<Au>,
% for style_struct in STYLE_STRUCTS:
${style_struct.ident}: style.${style_struct.ident},
% endfor
custom_properties: custom_properties
.map(Arc::new).or_else(|| inherited_style.custom_properties.clone()),
custom_properties: ::custom_properties::finish_cascade(
custom_properties, &inherited_style.custom_properties),
shareable: shareable,
root_font_size: context.root_font_size,
}, cacheable)