commit 6ea38474b2651b9f9e546293d3d21802722c712d
parent 8af4a089fd82803546bbf825577bebb8feb5cf48
Author: Oriol Brufau <obrufau@igalia.com>
Date: Sun, 12 Oct 2025 19:55:00 +0000
Bug 1993821 - Refactor imported stylesheets for Servo. r=firefox-style-system-reviewers,emilio
This patch does various things:
- Unifies the definitions and implementations of `ImportSheet` among
Gecko and Servo. In particular, Servo gains `ImportSheet::Pending`.
- Removes `Stylesheet::update_from_bytes()`. It was only used by Servo,
which does no longer need it.
- Drops unused parameter from `StylesheetLoader::request_stylesheet()`.
- Turns the `MediaList` parameter of `Stylesheet::from_bytes()` into
`Arc<Locked<MediaList>>`.
This is an import of https://github.com/servo/stylo/pull/250/ and
https://github.com/servo/stylo/pull/251/.
Differential Revision: https://phabricator.services.mozilla.com/D268321
Diffstat:
5 files changed, 21 insertions(+), 98 deletions(-)
diff --git a/servo/components/style/servo/encoding_support.rs b/servo/components/style/servo/encoding_support.rs
@@ -7,7 +7,7 @@
use crate::context::QuirksMode;
use crate::error_reporting::ParseErrorReporter;
use crate::media_queries::MediaList;
-use crate::shared_lock::SharedRwLock;
+use crate::shared_lock::{Locked, SharedRwLock};
use crate::stylesheets::{AllowImportRules, Origin, Stylesheet, StylesheetLoader, UrlExtraData};
use cssparser::{stylesheet_encoding, EncodingSupport};
use servo_arc::Arc;
@@ -59,7 +59,7 @@ impl Stylesheet {
protocol_encoding_label: Option<&str>,
environment_encoding: Option<&'static encoding_rs::Encoding>,
origin: Origin,
- media: MediaList,
+ media: Arc<Locked<MediaList>>,
shared_lock: SharedRwLock,
stylesheet_loader: Option<&dyn StylesheetLoader>,
error_reporter: Option<&dyn ParseErrorReporter>,
@@ -70,7 +70,7 @@ impl Stylesheet {
&string,
url_data,
origin,
- Arc::new(shared_lock.wrap(media)),
+ media,
shared_lock,
stylesheet_loader,
error_reporter,
@@ -78,26 +78,4 @@ impl Stylesheet {
AllowImportRules::Yes,
)
}
-
- /// Updates an empty stylesheet with a set of bytes that reached over the
- /// network.
- pub fn update_from_bytes(
- existing: &Stylesheet,
- bytes: &[u8],
- protocol_encoding_label: Option<&str>,
- environment_encoding: Option<&'static encoding_rs::Encoding>,
- url_data: UrlExtraData,
- stylesheet_loader: Option<&dyn StylesheetLoader>,
- error_reporter: Option<&dyn ParseErrorReporter>,
- ) {
- let string = decode_stylesheet_bytes(bytes, protocol_encoding_label, environment_encoding);
- Self::update_from_str(
- existing,
- &string,
- url_data,
- stylesheet_loader,
- error_reporter,
- AllowImportRules::Yes,
- )
- }
}
diff --git a/servo/components/style/stylesheets/import_rule.rs b/servo/components/style/stylesheets/import_rule.rs
@@ -19,12 +19,16 @@ use std::fmt::{self, Write};
use style_traits::{CssStringWriter, CssWriter, ToCss};
use to_shmem::{SharedMemoryBuilder, ToShmem};
-/// A sheet that is held from an import rule.
#[cfg(feature = "gecko")]
+type StyleSheet = crate::gecko::data::GeckoStyleSheet;
+#[cfg(feature = "servo")]
+type StyleSheet = ::servo_arc::Arc<crate::stylesheets::Stylesheet>;
+
+/// A sheet that is held from an import rule.
#[derive(Debug)]
pub enum ImportSheet {
/// A bonafide stylesheet.
- Sheet(crate::gecko::data::GeckoStyleSheet),
+ Sheet(StyleSheet),
/// An @import created while parsing off-main-thread, whose Gecko sheet has
/// yet to be created and attached.
@@ -34,10 +38,9 @@ pub enum ImportSheet {
Refused,
}
-#[cfg(feature = "gecko")]
impl ImportSheet {
- /// Creates a new ImportSheet from a GeckoStyleSheet.
- pub fn new(sheet: crate::gecko::data::GeckoStyleSheet) -> Self {
+ /// Creates a new ImportSheet from a stylesheet.
+ pub fn new(sheet: StyleSheet) -> Self {
ImportSheet::Sheet(sheet)
}
@@ -51,10 +54,10 @@ impl ImportSheet {
ImportSheet::Refused
}
- /// Returns a reference to the GeckoStyleSheet in this ImportSheet, if it
- /// exists.
- pub fn as_sheet(&self) -> Option<&crate::gecko::data::GeckoStyleSheet> {
+ /// Returns a reference to the stylesheet in this ImportSheet, if it exists.
+ pub fn as_sheet(&self) -> Option<&StyleSheet> {
match *self {
+ #[cfg(feature = "gecko")]
ImportSheet::Sheet(ref s) => {
debug_assert!(!s.hack_is_null());
if s.hack_is_null() {
@@ -62,6 +65,8 @@ impl ImportSheet {
}
Some(s)
},
+ #[cfg(feature = "servo")]
+ ImportSheet::Sheet(ref s) => Some(s),
ImportSheet::Refused | ImportSheet::Pending => None,
}
}
@@ -80,75 +85,21 @@ impl ImportSheet {
}
}
-#[cfg(feature = "gecko")]
impl DeepCloneWithLock for ImportSheet {
fn deep_clone_with_lock(&self, _lock: &SharedRwLock, _guard: &SharedRwLockReadGuard) -> Self {
- use crate::gecko::data::GeckoStyleSheet;
- use crate::gecko_bindings::bindings;
match *self {
+ #[cfg(feature = "gecko")]
ImportSheet::Sheet(ref s) => {
+ use crate::gecko_bindings::bindings;
let clone = unsafe { bindings::Gecko_StyleSheet_Clone(s.raw() as *const _) };
- ImportSheet::Sheet(unsafe { GeckoStyleSheet::from_addrefed(clone) })
+ ImportSheet::Sheet(unsafe { StyleSheet::from_addrefed(clone) })
},
- ImportSheet::Pending => ImportSheet::Pending,
- ImportSheet::Refused => ImportSheet::Refused,
- }
- }
-}
-
-/// A sheet that is held from an import rule.
-#[cfg(feature = "servo")]
-#[derive(Debug)]
-pub enum ImportSheet {
- /// A bonafide stylesheet.
- Sheet(::servo_arc::Arc<crate::stylesheets::Stylesheet>),
-
- /// An @import created with a false <supports-condition>, so will never be fetched.
- Refused,
-}
-
-#[cfg(feature = "servo")]
-impl ImportSheet {
- /// Creates a new ImportSheet from a stylesheet.
- pub fn new(sheet: ::servo_arc::Arc<crate::stylesheets::Stylesheet>) -> Self {
- ImportSheet::Sheet(sheet)
- }
-
- /// Creates a refused ImportSheet for a load that will not happen.
- pub fn new_refused() -> Self {
- ImportSheet::Refused
- }
-
- /// Returns a reference to the stylesheet in this ImportSheet, if it exists.
- pub fn as_sheet(&self) -> Option<&::servo_arc::Arc<crate::stylesheets::Stylesheet>> {
- match *self {
- ImportSheet::Sheet(ref s) => Some(s),
- ImportSheet::Refused => None,
- }
- }
-
- /// Returns the media list for this import rule.
- pub fn media<'a>(&'a self, guard: &'a SharedRwLockReadGuard) -> Option<&'a MediaList> {
- self.as_sheet().and_then(|s| s.media(guard))
- }
-
- /// Returns the rules for this import rule.
- pub fn rules<'a>(&'a self, guard: &'a SharedRwLockReadGuard) -> &'a [CssRule] {
- match self.as_sheet() {
- Some(s) => s.rules(guard),
- None => &[],
- }
- }
-}
-
-#[cfg(feature = "servo")]
-impl DeepCloneWithLock for ImportSheet {
- fn deep_clone_with_lock(&self, _lock: &SharedRwLock, _guard: &SharedRwLockReadGuard) -> Self {
- match *self {
+ #[cfg(feature = "servo")]
ImportSheet::Sheet(ref s) => {
use servo_arc::Arc;
ImportSheet::Sheet(Arc::new((&**s).clone()))
},
+ ImportSheet::Pending => ImportSheet::Pending,
ImportSheet::Refused => ImportSheet::Refused,
}
}
diff --git a/servo/components/style/stylesheets/loader.rs b/servo/components/style/stylesheets/loader.rs
@@ -6,7 +6,6 @@
//! for `@import` rules.
use crate::media_queries::MediaList;
-use crate::parser::ParserContext;
use crate::shared_lock::{Locked, SharedRwLock};
use crate::stylesheets::import_rule::{ImportLayer, ImportRule, ImportSupportsCondition};
use crate::values::CssUrl;
@@ -22,7 +21,6 @@ pub trait StylesheetLoader {
&self,
url: CssUrl,
location: SourceLocation,
- context: &ParserContext,
lock: &SharedRwLock,
media: Arc<Locked<MediaList>>,
supports: Option<ImportSupportsCondition>,
diff --git a/servo/components/style/stylesheets/rule_parser.rs b/servo/components/style/stylesheets/rule_parser.rs
@@ -424,7 +424,6 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a, 'i> {
let import_rule = loader.request_stylesheet(
url,
start.source_location(),
- &self.context,
&self.shared_lock,
media,
supports,
diff --git a/servo/ports/geckolib/stylesheet_loader.rs b/servo/ports/geckolib/stylesheet_loader.rs
@@ -16,7 +16,6 @@ use style::gecko_bindings::structs::{
use style::gecko_bindings::sugar::refptr::RefPtr;
use style::global_style_data::GLOBAL_STYLE_DATA;
use style::media_queries::MediaList;
-use style::parser::ParserContext;
use style::shared_lock::{Locked, SharedRwLock};
use style::stylesheets::import_rule::{ImportLayer, ImportSheet, ImportSupportsCondition};
use style::stylesheets::AllowImportRules;
@@ -47,7 +46,6 @@ impl StyleStylesheetLoader for StylesheetLoader {
&self,
url: CssUrl,
source_location: SourceLocation,
- _context: &ParserContext,
lock: &SharedRwLock,
media: Arc<Locked<MediaList>>,
supports: Option<ImportSupportsCondition>,
@@ -145,7 +143,6 @@ impl StyleStylesheetLoader for AsyncStylesheetParser {
&self,
url: CssUrl,
source_location: SourceLocation,
- _context: &ParserContext,
lock: &SharedRwLock,
media: Arc<Locked<MediaList>>,
supports: Option<ImportSupportsCondition>,
