From 0ae47b26594653e08e2b34d4be8ed3d85ac6a88a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= <emilio@crisal.io>
Date: Tue, 7 Aug 2018 10:36:18 +0000
Subject: [PATCH] style: Cleanup invalidation processor constructor.

It used to be this way because of lifetime issues (plus the shadow
datas were in RwLocks at some point IIRC). Now we guarantee that as long as the
element is away the cascade data is as well, so we don't need to thread it
around.

Differential Revision: https://phabricator.services.mozilla.com/D2768
---
 components/style/data.rs                      |  9 -------
 .../element/state_and_attributes.rs           | 24 +++++++++----------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/components/style/data.rs b/components/style/data.rs
index 3df6e31c769..71a0ac23320 100644
--- a/components/style/data.rs
+++ b/components/style/data.rs
@@ -16,7 +16,6 @@ use selector_parser::{PseudoElement, RestyleDamage, EAGER_PSEUDO_COUNT};
 use selectors::NthIndexCache;
 use servo_arc::Arc;
 use shared_lock::StylesheetGuards;
-use smallvec::SmallVec;
 use std::fmt;
 use std::mem;
 use std::ops::{Deref, DerefMut};
@@ -273,16 +272,8 @@ impl ElementData {
             return InvalidationResult::empty();
         }
 
-        let mut non_document_styles = SmallVec::<[_; 3]>::new();
-        let matches_doc_author_rules =
-            element.each_applicable_non_document_style_rule_data(|data, quirks_mode, host| {
-                non_document_styles.push((data, quirks_mode, host.map(|h| h.opaque())))
-            });
-
         let mut processor = StateAndAttrInvalidationProcessor::new(
             shared_context,
-            &non_document_styles,
-            matches_doc_author_rules,
             element,
             self,
             nth_index_cache,
diff --git a/components/style/invalidation/element/state_and_attributes.rs b/components/style/invalidation/element/state_and_attributes.rs
index a0f85ae30bb..88b012a2524 100644
--- a/components/style/invalidation/element/state_and_attributes.rs
+++ b/components/style/invalidation/element/state_and_attributes.rs
@@ -6,7 +6,7 @@
 //! changes.
 
 use {Atom, WeakAtom};
-use context::{QuirksMode, SharedStyleContext};
+use context::SharedStyleContext;
 use data::ElementData;
 use dom::TElement;
 use element_state::ElementState;
@@ -18,13 +18,11 @@ use invalidation::element::restyle_hints::RestyleHint;
 use selector_map::SelectorMap;
 use selector_parser::Snapshot;
 use selectors::NthIndexCache;
-use selectors::OpaqueElement;
 use selectors::attr::CaseSensitivity;
 use selectors::matching::{MatchingContext, MatchingMode, VisitedHandlingMode};
 use selectors::matching::matches_selector;
 use smallvec::SmallVec;
 use stylesheets::origin::{Origin, OriginSet};
-use stylist::CascadeData;
 
 #[derive(Debug, PartialEq)]
 enum VisitedDependent {
@@ -56,19 +54,15 @@ where
 /// changes.
 pub struct StateAndAttrInvalidationProcessor<'a, 'b: 'a, E: TElement> {
     shared_context: &'a SharedStyleContext<'b>,
-    shadow_rule_datas: &'a [(&'b CascadeData, QuirksMode, Option<OpaqueElement>)],
-    matches_document_author_rules: bool,
     element: E,
     data: &'a mut ElementData,
     matching_context: MatchingContext<'a, E::Impl>,
 }
 
-impl<'a, 'b: 'a, E: TElement> StateAndAttrInvalidationProcessor<'a, 'b, E> {
+impl<'a, 'b: 'a, E: TElement + 'b> StateAndAttrInvalidationProcessor<'a, 'b, E> {
     /// Creates a new StateAndAttrInvalidationProcessor.
     pub fn new(
         shared_context: &'a SharedStyleContext<'b>,
-        shadow_rule_datas: &'a [(&'b CascadeData, QuirksMode, Option<OpaqueElement>)],
-        matches_document_author_rules: bool,
         element: E,
         data: &'a mut ElementData,
         nth_index_cache: &'a mut NthIndexCache,
@@ -83,8 +77,6 @@ impl<'a, 'b: 'a, E: TElement> StateAndAttrInvalidationProcessor<'a, 'b, E> {
 
         Self {
             shared_context,
-            shadow_rule_datas,
-            matches_document_author_rules,
             element,
             data,
             matching_context,
@@ -157,6 +149,7 @@ where
         descendant_invalidations: &mut DescendantInvalidationLists<'a>,
         sibling_invalidations: &mut InvalidationVector<'a>,
     ) -> bool {
+        debug_assert_eq!(element, self.element);
         debug_assert!(element.has_snapshot(), "Why bothering?");
 
         let wrapper = ElementWrapper::new(element, &*self.shared_context.snapshot_map);
@@ -241,6 +234,13 @@ where
             element
         };
 
+        let mut shadow_rule_datas = SmallVec::<[_; 3]>::new();
+        let matches_document_author_rules =
+            element.each_applicable_non_document_style_rule_data(|data, quirks_mode, host| {
+                shadow_rule_datas.push((data, quirks_mode, host.map(|h| h.opaque())))
+            });
+
+
         let invalidated_self = {
             let mut collector = Collector {
                 wrapper,
@@ -258,7 +258,7 @@ where
                 invalidates_self: false,
             };
 
-            let document_origins = if !self.matches_document_author_rules {
+            let document_origins = if !matches_document_author_rules {
                 Origin::UserAgent.into()
             } else {
                 OriginSet::all()
@@ -271,7 +271,7 @@ where
                 }
             }
 
-            for &(ref data, quirks_mode, ref host) in self.shadow_rule_datas {
+            for &(ref data, quirks_mode, ref host) in &shadow_rule_datas {
                 // FIXME(emilio): Replace with assert / remove when we figure
                 // out what to do with the quirks mode mismatches
                 // (that is, when bug 1406875 is properly fixed).