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

Fix iteration order for building computed values’ "context"

Browse source
This commit is contained in:
Simon Sapin 2014-05-08 17:19:15 +01:00
parent 8186d4d429
commit 2afe048863
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/components/style/properties.rs.mako
View file

@ -1623,7 +1623,10 @@ fn cascade_with_cached_declarations(applicable_declarations: &[MatchedProperty],
% endfor % endfor
let mut seen = PropertyBitField::new(); let mut seen = PropertyBitField::new();
// Declaration blocks are stored in increasing precedence order,
// we want them in decreasing order here.
for sub_list in applicable_declarations.iter().rev() { for sub_list in applicable_declarations.iter().rev() {
// Declarations are already stored in reverse order.
for declaration in sub_list.declarations.iter() { for declaration in sub_list.declarations.iter() {
match *declaration { match *declaration {
% for style_struct in STYLE_STRUCTS: % for style_struct in STYLE_STRUCTS:
@ -1756,8 +1759,10 @@ pub fn cascade(applicable_declarations: &[MatchedProperty],
) )
// Initialize `context` // Initialize `context`
// Declarations blocks are already stored in increasing precedence order.
for sub_list in applicable_declarations.iter() { for sub_list in applicable_declarations.iter() {
for declaration in sub_list.declarations.iter() { // Declarations are stored in reverse source order, we want them in forward order here.
for declaration in sub_list.declarations.iter().rev() {
match *declaration { match *declaration {
font_size_declaration(ref value) => { font_size_declaration(ref value) => {
context.font_size = match *value { context.font_size = match *value {
@ -1823,7 +1828,10 @@ pub fn cascade(applicable_declarations: &[MatchedProperty],
% endfor % endfor
let mut cacheable = true; let mut cacheable = true;
let mut seen = PropertyBitField::new(); let mut seen = PropertyBitField::new();
// Declaration blocks are stored in increasing precedence order,
// we want them in decreasing order here.
for sub_list in applicable_declarations.iter().rev() { for sub_list in applicable_declarations.iter().rev() {
// Declarations are already stored in reverse order.
for declaration in sub_list.declarations.iter() { for declaration in sub_list.declarations.iter() {
match *declaration { match *declaration {
% for style_struct in STYLE_STRUCTS: % for style_struct in STYLE_STRUCTS: