Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(fonts): admit local-only CSS font declarations

ldm06e6bb4e43034
diff --git a/moli-renderer-v8/src/css_resource_urls.rs b/moli-renderer-v8/src/css_resource_urls.rs
index 28e3548cf..839a0e958 100644
--- a/moli-renderer-v8/src/css_resource_urls.rs
+++ b/moli-renderer-v8/src/css_resource_urls.rs
@@ -17,7 +17,7 @@ pub(crate) enum StylesheetLoadBlockingResourceKind {
#[derive(Clone, Debug, PartialEq)]
pub(crate) struct StylesheetLoadBlockingResource {
- request_url: Url,
+ request_url: Option<Url>,
kind: StylesheetLoadBlockingResourceKind,
web_font: Option<StylesheetWebFont>,
}
@@ -25,7 +25,7 @@ pub(crate) struct StylesheetLoadBlockingResource {
impl StylesheetLoadBlockingResource {
fn new(request_url: Url, kind: StylesheetLoadBlockingResourceKind) -> Self {
Self {
- request_url,
+ request_url: Some(request_url),
kind,
web_font: None,
}
@@ -35,7 +35,7 @@ impl StylesheetLoadBlockingResource {
Self::new(request_url, StylesheetLoadBlockingResourceKind::Image)
}
- pub(crate) fn font(request_url: Url, web_font: StylesheetWebFont) -> Self {
+ pub(crate) fn font(request_url: Option<Url>, web_font: StylesheetWebFont) -> Self {
Self {
request_url,
kind: StylesheetLoadBlockingResourceKind::Font,
@@ -43,16 +43,16 @@ impl StylesheetLoadBlockingResource {
}
}
- pub(crate) fn request_url(&self) -> &Url {
- &self.request_url
+ pub(crate) fn request_url(&self) -> Option<&Url> {
+ self.request_url.as_ref()
}
pub(crate) fn with_request_url(mut self, url: Url) -> Self {
- self.request_url = url;
+ self.request_url = Some(url);
self
}
- pub(crate) fn into_parts(self) -> (Url, Option<StylesheetWebFont>) {
+ pub(crate) fn into_parts(self) -> (Option<Url>, Option<StylesheetWebFont>) {
(self.request_url, self.web_font)
}
@@ -192,10 +192,15 @@ pub(crate) fn stylesheet_web_font_resource_with_resolved_sources(
css_text: &str,
sources: Vec<moli_css_parse::CssFontSource>,
) -> Option<StylesheetLoadBlockingResource> {
+ if sources.is_empty() {
+ return None;
+ }
+ // A font declaration can resolve entirely through local() without ever
+ // producing a URL. Admission selects a network source only if needed.
let request_url = sources.iter().find_map(|source| match source {
moli_css_parse::CssFontSource::Url(url) => Url::parse(url).ok(),
moli_css_parse::CssFontSource::Local(_) => None,
- })?;
+ });
let descriptor = parsed_web_font_face(css_text)?;
Some(stylesheet_web_font_resource_with_descriptor(
css_text,
@@ -207,14 +212,14 @@ pub(crate) fn stylesheet_web_font_resource_with_resolved_sources(
fn stylesheet_web_font_resource_with_descriptor(
css_text: &str,
- request_url: Url,
+ request_url: Option<Url>,
descriptor: ParsedWebFontFace,
sources: Vec<moli_css_parse::CssFontSource>,
) -> StylesheetLoadBlockingResource {
- // The slot describes a declaration, not a layout generation. Two
- // projections of the same parsed rule (the import response and the later
- // retained style world) must converge on one slot. Conversely, identical
- // relative declarations parsed under different stylesheet bases must not
+ // The slot identifies a shareable resource, not a layout generation or
+ // an individual declaration. The import response and retained style world
+ // must converge on one slot. Identical relative declarations parsed under
+ // different stylesheet bases must not
// alias, so identity includes every resolved fallback, its kind and order.
// Length-prefix strings so source boundaries cannot collide.
let mut slot_material = Vec::new();
@@ -333,6 +338,26 @@ mod tests {
Url::parse("https://example.test/assets/app.css").expect("base URL should parse")
}
+ #[test]
+ fn local_only_declarations_do_not_require_a_network_url() {
+ let resources = stylesheet_load_blocking_font_resources(
+ r#"@font-face { font-family: LocalOnly; src: local("First"), local("Second"); }"#,
+ &base_url(),
+ OptionalResourceFetchMask::FONT,
+ );
+ assert_eq!(resources.len(), 1);
+ assert_eq!(resources[0].request_url(), None);
+ let font = resources[0].web_font().expect("local-only declaration");
+ assert_eq!(font.face().family_name(), "LocalOnly");
+ assert_eq!(
+ font.sources(),
+ [
+ moli_css_parse::CssFontSource::Local("First".into()),
+ moli_css_parse::CssFontSource::Local("Second".into()),
+ ]
+ );
+ }
+
#[test]
fn selects_one_supported_source_per_font_face_and_keeps_descriptors() {
let resources = stylesheet_load_blocking_font_resources(
@@ -370,7 +395,7 @@ mod tests {
assert_eq!(
resources
.iter()
- .map(|resource| resource.request_url().to_string())
+ .map(|resource| resource.request_url().expect("URL source").to_string())
.collect::<Vec<_>>(),
vec![
"https://example.test/assets/fonts/demo.woff2",
@@ -453,8 +478,8 @@ mod tests {
)
.expect("the retained native rule should project its resolved font");
- assert_eq!(response_projection.request_url(), &resolved);
- assert_eq!(native_projection.request_url(), &resolved);
+ assert_eq!(response_projection.request_url(), Some(&resolved));
+ assert_eq!(native_projection.request_url(), Some(&resolved));
assert_eq!(
response_projection
.web_font()
@@ -547,7 +572,12 @@ mod tests {
let selected = |mask| {
stylesheet_load_blocking_font_resources(css, &base_url(), mask)
.into_iter()
- .map(|resource| (resource.kind(), resource.request_url().to_string()))
+ .map(|resource| {
+ (
+ resource.kind(),
+ resource.request_url().expect("URL source").to_string(),
+ )
+ })
.collect::<Vec<_>>()
};
@@ -596,7 +626,7 @@ mod tests {
assert_eq!(
resources
.iter()
- .map(|resource| resource.request_url().to_string())
+ .map(|resource| resource.request_url().expect("URL source").to_string())
.collect::<Vec<_>>(),
vec![
"https://example.test/assets/fonts/variable.woff2",
diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_frames/stylesheets.rs b/moli-renderer-v8/src/native_bridge/context_host/child_frames/stylesheets.rs
index 94e8067a3..025ddac8a 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/child_frames/stylesheets.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/child_frames/stylesheets.rs
@@ -259,7 +259,7 @@ impl JsContextHost {
tracing::debug!(
child_handle = ?completion.child_handle,
owner = ?completion.owner,
- url = %resource.request_url(),
+ url = ?resource.request_url(),
kind = ?resource.kind(),
"skipping stylesheet subresource for stale child document owner"
);
diff --git a/moli-renderer-v8/src/network_host/stylesheet_subresource.rs b/moli-renderer-v8/src/network_host/stylesheet_subresource.rs
index 8d78854b7..aec8ab456 100644
--- a/moli-renderer-v8/src/network_host/stylesheet_subresource.rs
+++ b/moli-renderer-v8/src/network_host/stylesheet_subresource.rs
@@ -56,6 +56,8 @@ pub(crate) fn start_stylesheet_subresource_fetch(
}
}
let (request_url, web_font) = resource.into_parts();
+ let request_url = request_url
+ .ok_or_else(|| "admitted stylesheet subresource is missing its network URL".to_owned())?;
let options = match resource_kind {
StylesheetLoadBlockingResourceKind::Image => SubresourceFetchOptions::CSS_IMAGE,
StylesheetLoadBlockingResourceKind::Font => SubresourceFetchOptions::FONT,
diff --git a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs
index ea2725f81..f1eb4316a 100644
--- a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs
+++ b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs
@@ -2615,7 +2615,7 @@ impl ScriptVm {
host.accept_current_main_stylesheet_subresource_load_delay()
else {
tracing::debug!(
- url = %resource.request_url(),
+ url = ?resource.request_url(),
kind = ?resource.kind(),
"skipping stylesheet subresource for stale main document owner"
);
@@ -2851,7 +2851,10 @@ mod tests {
assert_eq!(resources.len(), 1);
assert_eq!(
- resources[0].request_url().as_str(),
+ resources[0]
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str(),
"https://example.test/assets/fonts/demo.woff2"
);
assert_eq!(
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/selection_order.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/selection_order.rs
index 5d2f2f54c..44fb51934 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/selection_order.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/fonts/selection_order.rs
@@ -322,3 +322,31 @@ fn css_connected_font_face_add_is_noop_and_cannot_outlive_its_rule() {
assert_eq!(vm.eval("document.fonts.has(face)").unwrap(), "false");
assert_eq!(vm.document_web_font_counts_for_test().2, 0);
}
+
+#[tokio::test]
+async fn local_only_css_font_is_admitted_without_js_projection() {
+ use crate::native_bridge::document::take_owner_font_face_projection_count_for_test;
+ let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap();
+ loader.set_optional_resource_fetch_mask(crate::protocol_types::OptionalResourceFetchMask::FONT);
+ let (mut vm, _completions) = new_parsed_test_vm_with_loader_and_resource_completion_queue(
+ "https://local-only-font.test/",
+ "<!doctype html><html><head></head><body>local font</body></html>",
+ &loader,
+ );
+ vm.set_layout_policy(moli_page_types::LayoutPolicy::OnDemand);
+ take_owner_font_face_projection_count_for_test();
+ vm.eval(r#"
+ Object.defineProperty(document, 'fonts', {get() {throw new Error('unexpected document.fonts access')}});
+ const style=document.createElement('style');
+ style.textContent='@font-face{font-family:LocalOnly;src:local("MoliDefinitelyNotAFont-LocalOnly-92741")}';
+ document.head.append(style);
+ "#).unwrap();
+ vm.reconcile_document_web_fonts_for_layout();
+ // The local lookup reaches a synchronous error, with no URL request and
+ // no registration. Its native load still belongs to the declaration.
+ assert_eq!(vm.document_web_font_counts_for_test(), (1, 0, 0));
+ assert_eq!(take_owner_font_face_projection_count_for_test(), 0);
+ vm.eval("style.remove()").unwrap();
+ vm.reconcile_document_web_fonts_for_layout();
+ assert_eq!(vm.document_web_font_counts_for_test(), (0, 0, 0));
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/content_and_invalidation.rs b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/content_and_invalidation.rs
index 53a98f901..e0d2bf2b2 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/content_and_invalidation.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_xhr/computed_style/content_and_invalidation.rs
@@ -1053,7 +1053,10 @@ style.textContent = '@font-face { font-family: First; src: url(font-a.woff2); }'
.expect("the first observation should publish a resource manifest");
assert_eq!(first.web_fonts().len(), 1);
assert_eq!(
- first.web_fonts()[0].request_url().as_str(),
+ first.web_fonts()[0]
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str(),
"https://style-resource-manifest.test/font-a.woff2"
);
let update_materializations_after_first = vm
@@ -1088,7 +1091,10 @@ style.textContent = '@font-face { font-family: First; src: url(font-a.woff2); }'
assert_ne!(revised.generation(), first.generation());
assert_eq!(revised.web_fonts().len(), 1);
assert_eq!(
- revised.web_fonts()[0].request_url().as_str(),
+ revised.web_fonts()[0]
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str(),
"https://style-resource-manifest.test/font-b.woff2"
);
assert_eq!(
diff --git a/moli-renderer-v8/src/script_vm/web_fonts.rs b/moli-renderer-v8/src/script_vm/web_fonts.rs
index 4933de130..86eb52afd 100644
--- a/moli-renderer-v8/src/script_vm/web_fonts.rs
+++ b/moli-renderer-v8/src/script_vm/web_fonts.rs
@@ -182,7 +182,7 @@ impl DocumentWebFontState {
let next = load.borrow_mut().next_url(services);
if let Some(url) = next {
let url = url::Url::parse(&url).expect("CSS font fallback retains its parser URL");
- let resource = StylesheetLoadBlockingResource::font(url, request);
+ let resource = StylesheetLoadBlockingResource::font(Some(url), request);
return DocumentWebFontCompletion::Retry(Box::new(self.bind_request(resource, load)));
}
let active = self
@@ -324,7 +324,7 @@ mod tests {
panic!("invalid first source should advance to its fallback");
};
assert_eq!(
- second.request_url().as_str(),
+ second.request_url().expect("URL fallback").as_str(),
"https://example.test/second.woff2"
);
assert!(matches!(
diff --git a/moli-renderer-v8/src/style_engine/tests/subtree_cache/retained_stylesheets.rs b/moli-renderer-v8/src/style_engine/tests/subtree_cache/retained_stylesheets.rs
index 0f3ba0a7e..8e028f778 100644
--- a/moli-renderer-v8/src/style_engine/tests/subtree_cache/retained_stylesheets.rs
+++ b/moli-renderer-v8/src/style_engine/tests/subtree_cache/retained_stylesheets.rs
@@ -394,7 +394,10 @@ fn retained_stylesheet_resource_manifest_advances_only_when_resources_change() {
[url::Url::parse("https://example.test/theme-a.css").unwrap()]
);
assert_eq!(
- first.web_fonts()[0].request_url().as_str(),
+ first.web_fonts()[0]
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str(),
"https://example.test/font-a.woff2"
);
assert_eq!(author_source_text_parse_count_for_test(), 1);
@@ -475,7 +478,10 @@ fn retained_stylesheet_resource_manifest_advances_only_when_resources_change() {
[url::Url::parse("https://example.test/theme-b.css").unwrap()]
);
assert_eq!(
- second.web_fonts()[0].request_url().as_str(),
+ second.web_fonts()[0]
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str(),
"https://example.test/font-b.woff2"
);
assert_eq!(
@@ -581,7 +587,11 @@ fn retained_imported_font_resources_keep_each_import_parser_base_and_response_sl
.iter()
.map(|resource| {
(
- resource.request_url().as_str().to_owned(),
+ resource
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str()
+ .to_owned(),
resource
.web_font()
.expect("font manifest entry")
@@ -611,7 +621,10 @@ fn retained_imported_font_resources_keep_each_import_parser_base_and_response_sl
&response.response_url,
crate::protocol_types::OptionalResourceFetchMask::FONT,
) {
- let retained_slot = &retained_by_url[early.request_url().as_str()];
+ let retained_slot = &retained_by_url[early
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str()];
assert_eq!(
retained_slot,
early.web_font().expect("early response font").slot(),
@@ -670,7 +683,13 @@ fn retained_stylesheet_resource_manifest_tracks_effective_font_faces_across_medi
let mut urls = snapshot
.web_fonts()
.iter()
- .map(|resource| resource.request_url().as_str().to_owned())
+ .map(|resource| {
+ resource
+ .request_url()
+ .expect("URL-backed font fixture")
+ .as_str()
+ .to_owned()
+ })
.collect::<Vec<_>>();
urls.sort();
urls
diff --git a/moli-renderer-v8/src/stylesheet_runtime/settlement.rs b/moli-renderer-v8/src/stylesheet_runtime/settlement.rs
index aeb3fe12e..35d4f5657 100644
--- a/moli-renderer-v8/src/stylesheet_runtime/settlement.rs
+++ b/moli-renderer-v8/src/stylesheet_runtime/settlement.rs
@@ -235,7 +235,7 @@ impl DocumentRuntime {
let Some(binding) = host.accept_current_main_stylesheet_subresource_load_delay()
else {
tracing::debug!(
- url = %resource.request_url(),
+ url = ?resource.request_url(),
kind = ?resource.kind(),
"skipping stylesheet subresource for stale main document owner"
);
@@ -314,7 +314,11 @@ impl DocumentRuntime {
crate::css_resource_urls::StylesheetLoadBlockingResourceKind::Image
if retain_css_images =>
{
- let resolved_url = resource.request_url().as_str().to_owned();
+ let resolved_url = resource
+ .request_url()
+ .expect("CSS images have a URL")
+ .as_str()
+ .to_owned();
match host.admit_stylesheet_css_image(binding, resolved_url) {
crate::native_bridge::CssImageResourceAdmission::Fetch(identity) => {
admitted.push((binding, resource, Some(identity)));
@@ -332,7 +336,7 @@ impl DocumentRuntime {
}
let mut admitted = std::collections::VecDeque::from(admitted);
while let Some((binding, resource, css_image)) = admitted.pop_front() {
- let request_url = resource.request_url().clone();
+ let request_url = resource.request_url().cloned();
let kind = resource.kind();
let failed_css_image = css_image.clone();
let failed_web_font = (kind
@@ -378,7 +382,7 @@ impl DocumentRuntime {
admitted.push_back((binding, resource, None));
}
tracing::warn!(
- url = %request_url,
+ url = ?request_url,
?kind,
owner = ?binding.owner(),
settled = settlement.settled(),