Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(svg): apply computed fill-rule to geometric containment

ldm0985c527660c5
diff --git a/moli-renderer-v8/src/context_bootstrap/svg_runtime/builders.rs b/moli-renderer-v8/src/context_bootstrap/svg_runtime/builders.rs
index 169af290b..e0ab2eaf4 100644
--- a/moli-renderer-v8/src/context_bootstrap/svg_runtime/builders.rs
+++ b/moli-renderer-v8/src/context_bootstrap/svg_runtime/builders.rs
@@ -1857,12 +1857,25 @@ fn svg_element_has_display_none(
.eq_ignore_ascii_case("none")
}
-pub(super) fn svg_fill_allows_paint<'s>(
+pub(super) fn svg_geometry_fill_rule<'s>(
scope: &mut v8::PinScope<'s, '_>,
element: v8::Local<'s, v8::Object>,
-) -> bool {
- svg_owner_attribute_value(scope, element, "fill")
- .is_none_or(|fill| !fill.trim().eq_ignore_ascii_case("none"))
+) -> svg_geometry::SvgFillRule {
+ let Ok((runtime_ptr, handle)) =
+ crate::native_bridge::node_runtime_and_handle_from_object_or_detached(scope, element)
+ else {
+ return svg_geometry::SvgFillRule::NonZero;
+ };
+ let rule = crate::native_bridge::element::computed_style_property_for_handle(
+ unsafe { &*runtime_ptr },
+ handle,
+ "fill-rule",
+ );
+ if rule.trim().eq_ignore_ascii_case("evenodd") {
+ svg_geometry::SvgFillRule::EvenOdd
+ } else {
+ svg_geometry::SvgFillRule::NonZero
+ }
}
pub(super) fn svg_transform_value_or_throw<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/svg_runtime/callbacks.rs b/moli-renderer-v8/src/context_bootstrap/svg_runtime/callbacks.rs
index b2fcaba90..f48ab6108 100644
--- a/moli-renderer-v8/src/context_bootstrap/svg_runtime/callbacks.rs
+++ b/moli-renderer-v8/src/context_bootstrap/svg_runtime/callbacks.rs
@@ -3921,10 +3921,14 @@ pub(super) fn svg_geometry_is_point_in_fill_callback<'s>(
else {
return;
};
- let contains = svg_fill_allows_paint(scope, receiver)
- && svg_geometry_element(scope, receiver).is_some_and(|element| {
- svg_geometry::is_point_in_fill(&element, SvgGeometryPoint::new(point.x, point.y))
- });
+ let fill_rule = svg_geometry_fill_rule(scope, receiver);
+ let contains = svg_geometry_element(scope, receiver).is_some_and(|element| {
+ svg_geometry::is_point_in_fill_with_rule(
+ &element,
+ SvgGeometryPoint::new(point.x, point.y),
+ fill_rule,
+ )
+ });
rv.set(v8::Boolean::new(scope, contains).into());
}
diff --git a/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.js b/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.js
index 0a2cc4b5e..3d248ceb8 100644
--- a/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.js
+++ b/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.js
@@ -98,6 +98,15 @@
}
}
}
+ for (const {ownerName, kind, rect} of documents) {
+ const method = realm.SVGGeometryElement.prototype.isPointInFill;
+ for (const fill of ['none', 'transparent', 'red']) {
+ rect.setAttribute('fill', fill);
+ check(calleeName + '/' + ownerName + '/' + kind + ' geometric fill ' + fill,
+ () => Reflect.apply(method, rect, [{x: 5, y: 5}]) === true);
+ }
+ rect.removeAttribute('fill');
+ }
}
globalThis.__uiEventResults = {
complete: true, checks, total: checks.length,
diff --git a/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.rs b/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.rs
index e9bc44630..93110952e 100644
--- a/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.rs
+++ b/moli-renderer-v8/src/script_vm/tests/svg_geometry_methods.rs
@@ -7,7 +7,7 @@ fn svg_geometry_methods_validate_native_receivers_before_conversion() {
.unwrap();
vm.eval(include_str!("svg_geometry_methods.js")).unwrap();
assert_eq!(vm.eval("__uiEventResults.complete").unwrap(), "true");
- assert_eq!(vm.eval("__uiEventResults.total").unwrap(), "2126");
+ assert_eq!(vm.eval("__uiEventResults.total").unwrap(), "2174");
assert_eq!(
vm.eval("JSON.stringify(__uiEventResults.checks.filter(row => !row.passed))")
.unwrap(),
@@ -121,3 +121,38 @@ fn svg_distance_queries_use_webidl_float_conversion() {
"[]"
);
}
+
+#[test]
+fn svg_geometric_fill_uses_the_cascade_and_ignores_visual_paint() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://svg-geometric-fill.test/");
+ assert_eq!(
+ vm.eval(
+ r#"(() => {
+ document.body.innerHTML = '<style>.rings {fill-rule: evenodd}</style>' +
+ '<svg xmlns="http://www.w3.org/2000/svg"><path class="rings" fill="none" ' +
+ 'd="M0 0H10V10H0Z M2 2H8V8H2Z"/></svg>';
+ const path = document.querySelector('path');
+ const center = {x: 5, y: 5};
+ if (path.isPointInFill(center) || !path.isPointInFill({x: 2, y: 5})) throw Error('CSS evenodd');
+ path.style.fillRule = 'nonzero';
+ if (!path.isPointInFill(center)) throw Error('inline rule overrides stylesheet');
+ path.removeAttribute('class'); path.style.fillRule = '';
+ path.parentNode.setAttribute('fill-rule', 'evenodd');
+ if (path.isPointInFill(center)) throw Error('inherited rule');
+ path.setAttribute('fill-rule', 'nonzero');
+ for (const fill of ['none', 'transparent', 'red']) {
+ path.setAttribute('fill', fill);
+ if (!path.isPointInFill(center)) throw Error('paint affected geometry');
+ }
+ for (const value of [NaN, Infinity, -Infinity]) {
+ if (path.isPointInFill({x: value, y: 5}) || path.isPointInFill({x: 5, y: value})) {
+ throw Error('nonfinite coordinate');
+ }
+ }
+ return true;
+ })()"#,
+ )
+ .unwrap(),
+ "true"
+ );
+}