diff options
author | Emilio Cobos Álvarez <emilio@crisal.io> | 2020-08-10 18:00:44 +0000 |
---|---|---|
committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2021-02-26 16:44:05 +0100 |
commit | ca7e1ecfd8bd3c18b38f0e3890b6c05eedc7b60c (patch) | |
tree | 50f9778740b6adebe0abfbdf88ec838af4c9140a /components/style/stylesheet_set.rs | |
parent | dfa715a8d8b89f4e5768f30f2de892d320cb1bbb (diff) | |
download | servo-ca7e1ecfd8bd3c18b38f0e3890b6c05eedc7b60c.tar.gz servo-ca7e1ecfd8bd3c18b38f0e3890b6c05eedc7b60c.zip |
style: Invalidate for CSSOM changes in a more fine-grained way.
Also, for changes in CSS declarations, like changing
cssRules[i].style.color or something, we end up avoiding a lot of the
work we were doing.
This page still trips us in the sense that they add a stylesheet, then
call getBoundingClientRect(), then insert more rules in the stylesheet,
which causes us to rebuild a lot of the cascade data.
We could try to detect appends to the last stylesheet on the list or
something I guess, and avoid rebuilding the cascade data in some cases.
Depends on D85615
Differential Revision: https://phabricator.services.mozilla.com/D85616
Diffstat (limited to 'components/style/stylesheet_set.rs')
-rw-r--r-- | components/style/stylesheet_set.rs | 55 |
1 files changed, 53 insertions, 2 deletions
diff --git a/components/style/stylesheet_set.rs b/components/style/stylesheet_set.rs index a9cd39eef20..93f4b986052 100644 --- a/components/style/stylesheet_set.rs +++ b/components/style/stylesheet_set.rs @@ -5,11 +5,11 @@ //! A centralized set of stylesheets for a document. use crate::dom::TElement; -use crate::invalidation::stylesheets::StylesheetInvalidationSet; +use crate::invalidation::stylesheets::{StylesheetInvalidationSet, RuleChangeKind}; use crate::media_queries::Device; use crate::selector_parser::SnapshotMap; use crate::shared_lock::SharedRwLockReadGuard; -use crate::stylesheets::{Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument}; +use crate::stylesheets::{CssRule, Origin, OriginSet, OriginSetIterator, PerOrigin, StylesheetInDocument}; use std::{mem, slice}; /// Entry for a StylesheetSet. @@ -438,6 +438,56 @@ macro_rules! sheet_set_methods { let collection = self.collection_for(&sheet, guard); collection.remove(&sheet) } + + /// Notify the set that a rule from a given stylesheet has changed + /// somehow. + pub fn rule_changed( + &mut self, + device: Option<&Device>, + sheet: &S, + rule: &CssRule, + guard: &SharedRwLockReadGuard, + change_kind: RuleChangeKind, + ) { + if let Some(device) = device { + let quirks_mode = sheet.quirks_mode(guard); + self.invalidations.rule_changed( + sheet, + rule, + guard, + device, + quirks_mode, + change_kind, + ); + } + + let validity = match change_kind { + // Insertion / Removals need to rebuild both the cascade and + // invalidation data. For generic changes this is conservative, + // could be optimized on a per-case basis. + RuleChangeKind::Generic | + RuleChangeKind::Insertion | + RuleChangeKind::Removal => DataValidity::FullyInvalid, + // TODO(emilio): This, in theory, doesn't need to invalidate + // style data, if the rule we're modifying is actually in the + // CascadeData already. + // + // But this is actually a bit tricky to prove, because when we + // copy-on-write a stylesheet we don't bother doing a rebuild, + // so we may still have rules from the original stylesheet + // instead of the cloned one that we're modifying. So don't + // bother for now and unconditionally rebuild, it's no worse + // than what we were already doing anyway. + // + // Maybe we could record whether we saw a clone in this flush, + // and if so do the conservative thing, otherwise just + // early-return. + RuleChangeKind::StyleRuleDeclarations => DataValidity::FullyInvalid, + }; + + let collection = self.collection_for(&sheet, guard); + collection.set_data_validity_at_least(validity); + } }; } @@ -485,6 +535,7 @@ where /// Returns whether the given set has changed from the last flush. pub fn has_changed(&self) -> bool { + !self.invalidations.is_empty() || self.collections .iter_origins() .any(|(collection, _)| collection.dirty) |