Auto merge of #17959 - emilio:no-moar-parent, r=heycam

style: Move nsStyleContext::mParent to GeckoStyleContext.

Unfortunately this means that we lose the NS_STYLE_INHERIT_BIT optimization to
avoid posting changes if we had not requested the struct. In practice, I'm not
sure this optimization matters much, though, and we already compare all the
structs anyway.

We _could_ keep a weak parent pointer from the text style if needed, given we're
going to keep alive the text style at least until the parent style context goes
away, so should be safe, but I don't think the extra churn is worth it, to be
honest. Happy to do so as part of bug 1368290 if you think it's worth it.

Bug: 1385896
Reviewed-by: heycam
MozReview-Commit-ID: ka6tNwf4Ke

<!-- 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/17959)
<!-- Reviewable:end -->

components/style/gecko/generated/pseudo_element_definition.rs

@@ -362,7 +362,7 @@ impl PseudoElement {
 
     /// Whether this pseudo-element is an anonymous box.
     #[inline]
-    fn is_anon_box(&self) -> bool {
+    pub fn is_anon_box(&self) -> bool {
         match *self {
                     PseudoElement::MozText => true,
                     PseudoElement::OofPlaceholder => true,

components/style/gecko/pseudo_element_definition.mako.rs

@@ -57,7 +57,7 @@ impl PseudoElement {
 
     /// Whether this pseudo-element is an anonymous box.
     #[inline]
-    fn is_anon_box(&self) -> bool {
+    pub fn is_anon_box(&self) -> bool {
         match *self {
             % for pseudo in PSEUDOS:
                 % if pseudo.is_anon_box():

components/style/properties/computed_value_flags.rs

@@ -37,5 +37,12 @@ bitflags! {
         /// A flag used to mark styles under a relevant link that is also
         /// visited.
         const IS_RELEVANT_LINK_VISITED = 1 << 3,
+
+        /// A flag used to mark styles which are a pseudo-element or under one.
+        const IS_IN_PSEUDO_ELEMENT_SUBTREE = 1 << 4,
+
+        /// A flag used to mark styles which are in a display: none subtree, or
+        /// under one.
+        const IS_IN_DISPLAY_NONE_SUBTREE = 1 << 5,
     }
 }

components/style/properties/properties.mako.rs

@@ -2497,14 +2497,15 @@ pub struct StyleBuilder<'a> {
     /// a subtree.
     parent_style: Option<<&'a ComputedValues>,
 
-    /// The pseudo-element this style will represent.
-    pseudo: Option<<&'a PseudoElement>,
-
     /// The rule node representing the ordered list of rules matched for this
     /// node.
     rules: Option<StrongRuleNode>,
 
     custom_properties: Option<Arc<::custom_properties::CustomPropertiesMap>>,
+
+    /// The pseudo-element this style will represent.
+    pseudo: Option<<&'a PseudoElement>,
+
     /// The writing mode flags.
     ///
     /// TODO(emilio): Make private.
@@ -2701,6 +2702,11 @@ impl<'a> StyleBuilder<'a> {
         self.visited_style.is_some()
     }
 
+    /// Returns whether we're a pseudo-elements style.
+    pub fn is_pseudo_element(&self) -> bool {
+        self.pseudo.map_or(false, |p| !p.is_anon_box())
+    }
+
     /// Returns the style we're getting reset properties from.
     pub fn default_style(&self) -> &'a ComputedValues {
         self.reset_style

components/style/servo/selector_parser.rs

@@ -145,6 +145,11 @@ impl PseudoElement {
         self.cascade_type() == PseudoElementCascadeType::Lazy
     }
 
+    /// Whether this pseudo-element is for an anonymous box.
+    pub fn is_anon_box(&self) -> bool {
+        self.is_precomputed()
+    }
+
     /// Whether this pseudo-element is precomputed.
     #[inline]
     pub fn is_precomputed(&self) -> bool {

components/style/style_adjuster.rs

@@ -85,6 +85,22 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         }
     }
 
+    /// Compute a few common flags for both text and element's style.
+    pub fn set_bits(&mut self) {
+        use properties::computed_value_flags::IS_IN_DISPLAY_NONE_SUBTREE;
+        use properties::computed_value_flags::IS_IN_PSEUDO_ELEMENT_SUBTREE;
+
+        if self.style.inherited_flags().contains(IS_IN_DISPLAY_NONE_SUBTREE) ||
+            self.style.get_box().clone_display() == display::none {
+            self.style.flags.insert(IS_IN_DISPLAY_NONE_SUBTREE);
+        }
+
+        if self.style.inherited_flags().contains(IS_IN_PSEUDO_ELEMENT_SUBTREE) ||
+            self.style.is_pseudo_element() {
+            self.style.flags.insert(IS_IN_PSEUDO_ELEMENT_SUBTREE);
+        }
+    }
+
     /// Adjust the style for text style.
     ///
     /// The adjustments here are a subset of the adjustments generally, because
@@ -94,6 +110,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
     #[cfg(feature = "gecko")]
     pub fn adjust_for_text(&mut self) {
         self.adjust_for_text_combine_upright();
+        self.set_bits();
     }
 
     /// Change writing mode of the text frame for text-combine-upright.
@@ -522,5 +539,6 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> {
         {
             self.adjust_for_ruby(layout_parent_style, flags);
         }
+        self.set_bits();
     }
 }

ports/geckolib/glue.rs

@@ -1783,6 +1783,7 @@ pub extern "C" fn Servo_ComputedValues_Inherit(
 #[no_mangle]
 pub extern "C" fn Servo_ComputedValues_GetStyleBits(values: ServoStyleContextBorrowed) -> u64 {
     use style::properties::computed_value_flags::*;
+    // FIXME(emilio): We could do this more efficiently I'm quite sure.
     let flags = values.flags;
     let mut result = 0;
     if flags.contains(IS_RELEVANT_LINK_VISITED) {
@@ -1797,6 +1798,12 @@ pub extern "C" fn Servo_ComputedValues_GetStyleBits(values: ServoStyleContextBor
     if flags.contains(IS_TEXT_COMBINED) {
         result |= structs::NS_STYLE_IS_TEXT_COMBINED as u64;
     }
+    if flags.contains(IS_IN_PSEUDO_ELEMENT_SUBTREE) {
+        result |= structs::NS_STYLE_HAS_PSEUDO_ELEMENT_DATA as u64;
+    }
+    if flags.contains(IS_IN_DISPLAY_NONE_SUBTREE) {
+        result |= structs::NS_STYLE_IN_DISPLAY_NONE_SUBTREE as u64;
+    }
     result
 }