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

Have CSSOM append rather than replace slot in declaration block.

Browse source 
The early return for identical setting in importance matching as well
as the comment before `index_to_remove` are removed because the order
is web-exposing regardless of whether it's from CSSOM or parsing. e.g.
`top: 1px; left: 2px; top: 1px;` is effectively `left: 2px; top: 1px;`,
not `top: 1px; left: 2px;`.
This commit is contained in:
Xidorn Quan 2018-04-07 19:58:27 +10:00
parent ecf71d77cd
commit 3274e84278
1 changed files with 20 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/style/properties/declaration_block.rs
View file

@ -518,30 +518,14 @@ impl PropertyDeclarationBlock {
}
let important = self.declarations_importance.get(i as u32);
match (important, importance.important()) {
(false, true) => {}
(true, false) => {
// For declarations set from the OM, more-important
// declarations are overridden.
if !matches!(source, DeclarationSource::CssOm) {
return false
}
}
_ => if *slot == declaration {
return false;
}
}
match source {
// CSSOM preserves the declaration position, and
// overrides importance.
DeclarationSource::CssOm => {
*slot = declaration;
self.declarations_importance.set(i as u32, importance.important());
// For declarations from parsing, non-important declarations
// shouldn't override existing important one.
if important && !importance.important() &&
matches!(source, DeclarationSource::Parsing) {
return true;
}
DeclarationSource::Parsing => {
if matches!(source, DeclarationSource::Parsing) {
// As a compatibility hack, specially on Android,
// don't allow to override a prefixed webkit display
// value with an unprefixed version from parsing
@ -557,15 +541,11 @@ impl PropertyDeclarationBlock {
}
}
}
}
// NOTE(emilio): We could avoid this and just override for
// properties not affected by logical props, but it's not
// clear it's worth it given the `definitely_new` check.
index_to_remove = Some(i);
break;
}
}
}
if let Some(index) = index_to_remove {
self.declarations.remove(index);