servo: Merge #15523 - stylo: align RESTYLE_STYLE_ATTRIBUTE value with eRestyle_StyleAttribute (from heycam:rshint-style); r=bholley

This is the Servo-side part of https://bugzilla.mozilla.org/show_bug.cgi?id=1338461, which @bholley reviewed.

Source-Repo: https://github.com/servo/servo
Source-Revision: b8fcf127df8009791ef37fcf02d72c8ddd7c5998

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 6d353c0901666199b6b0904edc2236cf02317710

servo/components/style/restyle_hints.rs

@@ -29,6 +29,11 @@ bitflags! {
     /// id, class, and attribute selectors. Doing this conservatively is
     /// expensive, and so we use RestyleHints to short-circuit work we know is
     /// unnecessary.
+    ///
+    /// Note that the bit values here must be kept in sync with the Gecko
+    /// nsRestyleHint values.  If you add more bits with matching values,
+    /// please add assertions to assert_restyle_hints_match in
+    /// tests/unit/stylo/sanity_checks.rs.
     pub flags RestyleHint: u32 {
         /// Rerun selector matching on the element.
         const RESTYLE_SELF = 0x01,
@@ -46,7 +51,7 @@ bitflags! {
         /// Don't re-run selector-matching on the element, only the style
         /// attribute has changed, and this change didn't have any other
         /// dependencies.
-        const RESTYLE_STYLE_ATTRIBUTE = 0x10,
+        const RESTYLE_STYLE_ATTRIBUTE = 0x80,
     }
 }
 

servo/tests/unit/stylo/sanity_checks.rs

@@ -32,15 +32,31 @@ fn assert_restyle_hints_match() {
     use style::restyle_hints::*; // For flags
     use style::gecko_bindings::structs;
 
-    check_enum_value_non_static!(structs::nsRestyleHint_eRestyle_Self, RESTYLE_SELF.bits());
-    // XXX This for Servo actually means something like an hypothetical
-    // Restyle_AllDescendants (but without running selector matching on the
-    // element). ServoRestyleManager interprets it like that, but in practice we
-    // should align the behavior with Gecko adding a new restyle hint, maybe?
-    //
-    // See https://bugzilla.mozilla.org/show_bug.cgi?id=1291786
-    check_enum_value_non_static!(structs::nsRestyleHint_eRestyle_SomeDescendants, RESTYLE_DESCENDANTS.bits());
-    check_enum_value_non_static!(structs::nsRestyleHint_eRestyle_LaterSiblings, RESTYLE_LATER_SIBLINGS.bits());
+    macro_rules! check_restyle_hints {
+        ( $( $a:ident => $b:ident ),*, ) => {
+            {
+                let mut hints = RestyleHint::all();
+                $(
+                    check_enum_value_non_static!(structs::$a, $b.bits());
+                    hints.remove($b);
+                )*
+                assert_eq!(hints, RestyleHint::empty(), "all RestyleHint bits should have an assertion");
+            }
+        }
+    }
+
+    check_restyle_hints! {
+        nsRestyleHint_eRestyle_Self => RESTYLE_SELF,
+        // XXX This for Servo actually means something like an hypothetical
+        // Restyle_AllDescendants (but without running selector matching on the
+        // element). ServoRestyleManager interprets it like that, but in practice we
+        // should align the behavior with Gecko adding a new restyle hint, maybe?
+        //
+        // See https://bugzilla.mozilla.org/show_bug.cgi?id=1291786
+        nsRestyleHint_eRestyle_SomeDescendants => RESTYLE_DESCENDANTS,
+        nsRestyleHint_eRestyle_LaterSiblings => RESTYLE_LATER_SIBLINGS,
+        nsRestyleHint_eRestyle_StyleAttribute => RESTYLE_STYLE_ATTRIBUTE,
+    }
 }
 
 // Note that we can't call each_pseudo_element, parse_pseudo_element, or