Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 15:23:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Further changes required by Servo

Browse source
This commit is contained in:
Oriol Brufau 2023-05-27 06:22:32 +02:00
parent 6bc198b757
commit f063308e33
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/script/stylesheet_loader.rs
View file

@ -38,7 +38,7 @@ use std::sync::Mutex;
use style::media_queries::MediaList; use style::media_queries::MediaList;
use style::parser::ParserContext; use style::parser::ParserContext;
use style::shared_lock::{Locked, SharedRwLock}; use style::shared_lock::{Locked, SharedRwLock};
use style::stylesheets::import_rule::ImportSheet; use style::stylesheets::import_rule::{ImportLayer, ImportSheet};
use style::stylesheets::StylesheetLoader as StyleStylesheetLoader; use style::stylesheets::StylesheetLoader as StyleStylesheetLoader;
use style::stylesheets::{CssRules, ImportRule, Origin, Stylesheet, StylesheetContents}; use style::stylesheets::{CssRules, ImportRule, Origin, Stylesheet, StylesheetContents};
use style::values::CssUrl; use style::values::CssUrl;
@ -358,6 +358,7 @@ impl<'a> StyleStylesheetLoader for StylesheetLoader<'a> {
context: &ParserContext, context: &ParserContext,
lock: &SharedRwLock, lock: &SharedRwLock,
media: Arc<Locked<MediaList>>, media: Arc<Locked<MediaList>>,
layer: Option<ImportLayer>,
) -> Arc<Locked<ImportRule>> { ) -> Arc<Locked<ImportRule>> {
let sheet = Arc::new(Stylesheet { let sheet = Arc::new(Stylesheet {
contents: StylesheetContents::from_shared_data( contents: StylesheetContents::from_shared_data(
@ -374,8 +375,9 @@ impl<'a> StyleStylesheetLoader for StylesheetLoader<'a> {
let stylesheet = ImportSheet(sheet.clone()); let stylesheet = ImportSheet(sheet.clone());
let import = ImportRule { let import = ImportRule {
url, url,
source_location,
stylesheet, stylesheet,
layer,
source_location,
}; };
let url = match import.url.url().cloned() { let url = match import.url.url().cloned() {

7
components/style/stylesheets/rule_parser.rs
View file

@ -207,7 +207,12 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> {
let url_string = input.expect_url_or_string()?.as_ref().to_owned(); let url_string = input.expect_url_or_string()?.as_ref().to_owned();
let url = CssUrl::parse_from_string(url_string, &self.context, CorsMode::None); let url = CssUrl::parse_from_string(url_string, &self.context, CorsMode::None);
let layer = if !static_prefs::pref!("layout.css.cascade-layers.enabled") { #[cfg(feature = "gecko")]
let layers_enabled = static_prefs::pref!("layout.css.cascade-layers.enabled");
#[cfg(feature = "servo")]
let layers_enabled = false;
let layer = if !layers_enabled {
None None
} else if input.try_parse(|input| input.expect_ident_matching("layer")).is_ok() { } else if input.try_parse(|input| input.expect_ident_matching("layer")).is_ok() {
Some(ImportLayer { Some(ImportLayer {