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

style: Not all computed value flags are really inherited.

Browse source 
This fixes the fishiness I noticed in:

  https://bugzilla.mozilla.org/show_bug.cgi?id=1407832
This commit is contained in:
Emilio Cobos Álvarez 2017-10-14 14:44:20 +02:00
parent 8b366a7441
commit b73b5b581b
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/matching.rs
View file

@ -360,8 +360,8 @@ trait PrivateMatchMethods: TElement {
debug!(" > style difference: {:?}", difference);
// We need to cascade the children in order to ensure the correct
// propagation of computed value flags.
if old_values.flags != new_values.flags {
// propagation of inherited computed value flags.
if old_values.flags.inherited() != new_values.flags.inherited() {
debug!(" > flags changed: {:?} != {:?}", old_values.flags, new_values.flags);
return ChildCascadeRequirement::MustCascadeChildren;
}

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

@ -64,3 +64,11 @@ bitflags! {
const IS_STYLE_IF_VISITED = 1 << 9,
}
}
impl ComputedValueFlags {
/// Returns the flags that are inherited.
#[inline]
pub fn inherited(self) -> Self {
self & !(INHERITS_DISPLAY | INHERITS_CONTENT | INHERITS_RESET_STYLE)
}
}

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

@ -2872,7 +2872,7 @@ impl<'a> StyleBuilder<'a> {
/* rules = */ None,
parent.custom_properties().cloned(),
parent.writing_mode,
parent.flags,
parent.flags.inherited(),
visited_style,
)
}