Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

refactor(style): retain font face rule identity

ldm085cfffcc6387
diff --git a/moli-renderer-v8/src/style_engine/active_stylesheets.rs b/moli-renderer-v8/src/style_engine/active_stylesheets.rs
index 1c2f07c94..54bbddcf9 100644
--- a/moli-renderer-v8/src/style_engine/active_stylesheets.rs
+++ b/moli-renderer-v8/src/style_engine/active_stylesheets.rs
@@ -1,6 +1,10 @@
use std::sync::Arc;
use style::{
- shared_lock::SharedRwLockReadGuard, stylesheets::DocumentStyleSheet, stylist::Stylist,
+ font_face::FontFaceRule,
+ servo_arc::Arc as ServoArc,
+ shared_lock::{Locked, SharedRwLockReadGuard},
+ stylesheets::DocumentStyleSheet,
+ stylist::Stylist,
};
use crate::css_resource_urls::StylesheetLoadBlockingResource;
@@ -65,25 +69,32 @@ pub(super) struct ActiveStylesheet {
/// One parsed `@font-face` resource tied to its native Stylo rule.
///
-/// Retaining the rule address lets device changes project the already-parsed
-/// resource set through Stylo's effective-rule iterator without reparsing or
-/// treating every installed stylesheet as currently effective.
+/// The strong rule reference cannot outlive its owning `ActiveStylesheet`, but
+/// it prevents a removed rule's allocation address from being reused before
+/// the next style observation reconciles this resource snapshot.
#[derive(Clone)]
pub(super) struct ActiveWebFontResource {
- rule_address: usize,
+ /// Stable native-rule identity for device-aware resource projection.
+ ///
+ /// Projection compares this allocation's address with Stylo's current
+ /// effective `@font-face` rules. Keeping a strong reference here pins that
+ /// allocation until this `ActiveStylesheet` snapshot is reconciled, so a
+ /// removed rule cannot release and recycle its address into a false match.
+ /// The rule contents are not read through this field.
+ rule: ServoArc<Locked<FontFaceRule>>,
resource: StylesheetLoadBlockingResource,
}
impl ActiveWebFontResource {
- pub(super) fn new(rule_address: usize, resource: StylesheetLoadBlockingResource) -> Self {
- Self {
- rule_address,
- resource,
- }
+ pub(super) fn new(
+ rule: ServoArc<Locked<FontFaceRule>>,
+ resource: StylesheetLoadBlockingResource,
+ ) -> Self {
+ Self { rule, resource }
}
pub(super) fn rule_address(&self) -> usize {
- self.rule_address
+ self.rule.raw_ptr().as_ptr() as usize
}
pub(super) fn resource(&self) -> &StylesheetLoadBlockingResource {
diff --git a/moli-renderer-v8/src/style_engine/stylesheet.rs b/moli-renderer-v8/src/style_engine/stylesheet.rs
index fcbc421cf..ba4bda8cb 100644
--- a/moli-renderer-v8/src/style_engine/stylesheet.rs
+++ b/moli-renderer-v8/src/style_engine/stylesheet.rs
@@ -104,12 +104,11 @@ pub(super) fn install_active_stylesheet(
let web_font_resources = native_font_face_rules_for_stylesheet(&stylesheet)
.into_iter()
.filter_map(|rule| {
- let rule_address = rule.rule.raw_ptr().as_ptr() as usize;
- crate::css_resource_urls::stylesheet_web_font_resource(
+ let resource = crate::css_resource_urls::stylesheet_web_font_resource(
&rule.rule_fingerprint,
source.base_url(),
- )
- .map(|resource| ActiveWebFontResource::new(rule_address, resource))
+ )?;
+ Some(ActiveWebFontResource::new(rule.rule, resource))
})
.collect::<Vec<_>>();
ActiveStylesheet::new(