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

Auto merge of #15909 - heycam:hint-subtree, r=bholley

Browse source 
stylo: Align eRestyle_Subtree value with RESTYLE_DESCENDANTS.

Handle the translation of eRestyle_Subtree into
(RESTYLE_SELF | RESTYLE_DESCENDANTS) in the From impl, too.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15909)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-10 17:37:31 -08:00 • committed by GitHub
commit 2f8cf6afc3
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
components/style/restyle_hints.rs
View file

@ -41,7 +41,7 @@ bitflags! {
/// ///
/// NB: In Gecko, we have RESTYLE_SUBTREE which is inclusive of self, /// NB: In Gecko, we have RESTYLE_SUBTREE which is inclusive of self,
/// but heycam isn't aware of a good reason for that. /// but heycam isn't aware of a good reason for that.
const RESTYLE_DESCENDANTS = 0x02, const RESTYLE_DESCENDANTS = 0x04,
/// Rerun selector matching on all later siblings of the element and all /// Rerun selector matching on all later siblings of the element and all
/// of their descendants. /// of their descendants.
@ -75,13 +75,11 @@ pub fn assert_restyle_hints_match() {
check_restyle_hints! { check_restyle_hints! {
nsRestyleHint_eRestyle_Self => RESTYLE_SELF, nsRestyleHint_eRestyle_Self => RESTYLE_SELF,
// XXX This for Servo actually means something like an hypothetical // Note that eRestyle_Subtree means "self and descendants", while
// Restyle_AllDescendants (but without running selector matching on the // RESTYLE_DESCENDANTS means descendants only. The From impl
// element). ServoRestyleManager interprets it like that, but in practice we // below handles converting eRestyle_Subtree into
// should align the behavior with Gecko adding a new restyle hint, maybe? // (RESTYLE_SELF | RESTYLE_DESCENDANTS).
// nsRestyleHint_eRestyle_Subtree => RESTYLE_DESCENDANTS,
// See https://bugzilla.mozilla.org/show_bug.cgi?id=1291786
nsRestyleHint_eRestyle_SomeDescendants => RESTYLE_DESCENDANTS,
nsRestyleHint_eRestyle_LaterSiblings => RESTYLE_LATER_SIBLINGS, nsRestyleHint_eRestyle_LaterSiblings => RESTYLE_LATER_SIBLINGS,
nsRestyleHint_eRestyle_StyleAttribute => RESTYLE_STYLE_ATTRIBUTE, nsRestyleHint_eRestyle_StyleAttribute => RESTYLE_STYLE_ATTRIBUTE,
} }
@ -106,7 +104,14 @@ impl From<nsRestyleHint> for RestyleHint {
warn!("stylo: dropping unsupported restyle hint bits"); warn!("stylo: dropping unsupported restyle hint bits");
} }
Self::from_bits_truncate(raw_bits) let mut bits = Self::from_bits_truncate(raw_bits);
// eRestyle_Subtree converts to (RESTYLE_SELF | RESTYLE_DESCENDANTS).
if bits.contains(RESTYLE_DESCENDANTS) {
bits |= RESTYLE_SELF;
}
bits
} }
} }