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

Bug 1357583: style: Recurse into @import rules when looking at the added rules. r=heycam

Browse source 
Apparently my whole conception of how the list of sheets in the styleset looked
like was flawled, and we only ever get one append_sheet for the topmost
stylesheet, instead of one for each.

MozReview-Commit-ID: FMClygMJkTc
This commit is contained in:
Emilio Cobos Álvarez 2017-05-26 22:16:14 +02:00
parent f569274cca
commit ebd6f47be3
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
components/style/invalidation/mod.rs
View file

@ -182,6 +182,9 @@ impl StylesheetInvalidationSet {
}
/// Collects invalidations for a given list of CSS rules.
///
/// TODO(emilio): Convert stylesheet.effective_rules into an iterator to
/// share code. This needs the ability to stop ASAP.
fn collect_invalidations_for_rule_list(
&mut self,
rules: &CssRules,
@ -294,8 +297,20 @@ impl StylesheetInvalidationSet {
Namespace(..) => {
// Irrelevant to which selector scopes match.
}
Import(..) => {
// We'll visit the appropriate stylesheet if/when it matters.
// NB: We need to do it here, we won't visit the appropriate sheet
// otherwise!
Import(ref lock) => {
let import_rule = lock.read_with(guard);
let mq = import_rule.stylesheet.media.read_with(guard);
if !mq.evaluate(stylist.device(), stylist.quirks_mode()) {
return true;
}
self.collect_invalidations_for_rule_list(
import_rule.stylesheet.rules.read_with(guard),
stylist,
guard);
}
Media(ref lock) => {
let media_rule = lock.read_with(guard);