Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(geometry): preserve point dictionary conversion order

ldm0a221393a4ff1
diff --git a/moli-renderer-v8/src/context_bootstrap/geometry_runtime.rs b/moli-renderer-v8/src/context_bootstrap/geometry_runtime.rs
index 3e8edbeaf..cee092b3d 100644
--- a/moli-renderer-v8/src/context_bootstrap/geometry_runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/geometry_runtime.rs
@@ -464,23 +464,24 @@ struct DomMatrixConstructorDeclaration {
#[derive(Clone, Copy, webidl::WebIdlDictionary)]
#[webidl(prefix = "DOMPointInit")]
pub(super) struct DomPointInit {
+ // WebIDL converts dictionary members in lexicographic order.
+ #[webidl(default = 1.0)]
+ pub(super) w: f64,
#[webidl(default = 0.0)]
pub(super) x: f64,
#[webidl(default = 0.0)]
pub(super) y: f64,
#[webidl(default = 0.0)]
pub(super) z: f64,
- #[webidl(default = 1.0)]
- pub(super) w: f64,
}
impl Default for DomPointInit {
fn default() -> Self {
Self {
+ w: 1.0,
x: 0.0,
y: 0.0,
z: 0.0,
- w: 1.0,
}
}
}
diff --git a/moli-renderer-v8/src/context_bootstrap/svg_runtime/bindings.rs b/moli-renderer-v8/src/context_bootstrap/svg_runtime/bindings.rs
index eb23cdab6..84460bea7 100644
--- a/moli-renderer-v8/src/context_bootstrap/svg_runtime/bindings.rs
+++ b/moli-renderer-v8/src/context_bootstrap/svg_runtime/bindings.rs
@@ -420,8 +420,9 @@ struct SvgTextContentElementTemplateMethodsDeclaration {
#[webapi(
method = "getCharNumAtPosition",
- length = 1,
- callback = svg_text_content_get_char_num_at_position_callback
+ length = 0,
+ callback = svg_text_content_get_char_num_at_position_callback,
+ receiver = web_api_interfaces::SVGTextContentElement::is_instance
)]
get_char_num_at_position: (),
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 ec10c54b9..8828bec1f 100644
--- a/moli-renderer-v8/src/context_bootstrap/svg_runtime/callbacks.rs
+++ b/moli-renderer-v8/src/context_bootstrap/svg_runtime/callbacks.rs
@@ -1926,14 +1926,9 @@ pub(super) fn svg_text_content_get_char_num_at_position_callback<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let Some(_point) = optional_dom_point_init_arg(
- scope,
- &args,
- 0,
- "SVGTextContentElement.getCharNumAtPosition",
- ) else {
+ if webidl::parse_args::<SvgTextPointArgs>(scope, &args).is_none() {
return;
- };
+ }
rv.set(v8::Integer::new(scope, -1).into());
}
diff --git a/moli-renderer-v8/src/context_bootstrap/svg_runtime/mod.rs b/moli-renderer-v8/src/context_bootstrap/svg_runtime/mod.rs
index 956e15bc1..e26593b89 100644
--- a/moli-renderer-v8/src/context_bootstrap/svg_runtime/mod.rs
+++ b/moli-renderer-v8/src/context_bootstrap/svg_runtime/mod.rs
@@ -208,6 +208,13 @@ struct SvgTextCharacterIndexArgs {
charnum: u32,
}
+#[derive(webidl::WebIdlArgs)]
+#[webidl(prefix = "SVGTextContentElement.getCharNumAtPosition")]
+struct SvgTextPointArgs {
+ #[webidl(dictionary)]
+ _point: super::geometry_runtime::DomPointInit,
+}
+
#[derive(webidl::WebIdlArgs)]
#[webidl(prefix = "SVGTextContentElement substring")]
struct SvgTextSubstringArgs {
diff --git a/moli-renderer-v8/src/script_vm/tests/geometry_point_conversion_order.js b/moli-renderer-v8/src/script_vm/tests/geometry_point_conversion_order.js
new file mode 100644
index 000000000..3c2c8263b
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/geometry_point_conversion_order.js
@@ -0,0 +1,25 @@
+(() => {
+ const checks=[],ns='http://www.w3.org/2000/svg';
+ const check=(name,fn)=>{try{checks.push({name,passed:fn()===true});}catch(error){checks.push({name,passed:false,error:String(error)});}};
+ const realms=[window,document.querySelector('iframe').contentWindow],names=['w','x','y','z'];
+ const typeError=(realm,fn)=>{try{fn();}catch(error){return Object.getPrototypeOf(error)===realm.TypeError.prototype;}return false;};
+ for(const [ownerIndex,owner] of realms.entries()) {
+ const docs=[owner.document,owner.document.implementation.createHTMLDocument(''),owner.document.implementation.createDocument(ns,'svg'),new owner.DOMParser().parseFromString('<svg xmlns="'+ns+'"/>','image/svg+xml')];
+ for(const [docIndex,doc] of docs.entries())for(const [calleeIndex,callee] of realms.entries()) {
+ const line=doc.createElementNS(ns,'line'),matrix=new callee.DOMMatrix();
+ const calls=[['DOMPoint.fromPoint',point=>callee.DOMPoint.fromPoint(point)],['DOMMatrix.transformPoint',point=>matrix.transformPoint(point)],['isPointInFill',point=>callee.SVGGeometryElement.prototype.isPointInFill.call(line,point)],['isPointInStroke',point=>callee.SVGGeometryElement.prototype.isPointInStroke.call(line,point)]];
+ for(const [name,call] of calls) {
+ const prefix=`point-order/${ownerIndex}/${docIndex}/${calleeIndex}/${name}`;
+ check(prefix+'/getter-number-order',()=>{const order=[],point={};for(const key of names)Object.defineProperty(point,key,{get(){order.push(key);return {valueOf(){order.push(key+'-number');return 1;}};}});call(point);return order.join(',')==='w,w-number,x,x-number,y,y-number,z,z-number';});
+ check(prefix+'/inherited-dictionary',()=>{const order=[],prototype={};for(const key of names)Object.defineProperty(prototype,key,{get(){order.push(key);return 1;}});call(Object.create(prototype));return order.join(',')==='w,x,y,z';});
+ check(prefix+'/proxy-dictionary',()=>{const order=[];call(new owner.Proxy({},{get(target,key){order.push(key);return 1;}}));return order.join(',')==='w,x,y,z';});
+ for(const key of names)for(const number of [false,true])check(prefix+'/exception/'+key+'/'+number,()=>{const sentinel={},order=[],point={};for(const member of names)Object.defineProperty(point,member,{get(){order.push(member);if(member===key){if(!number)throw sentinel;return {valueOf(){order.push(member+'-number');throw sentinel;}};}return 1;}});try{call(point);}catch(error){const expected=names.slice(0,names.indexOf(key)+1);if(number)expected.push(key+'-number');return error===sentinel && order.join(',')===expected.join(',');}return false;});
+ for(const [index,value] of [undefined,null,{},[],()=>{}].entries())check(prefix+'/empty-dictionary/'+index,()=>{call(value);return true;});
+ for(const [index,value] of [0,true,'point',Symbol(),1n].entries())check(prefix+'/invalid-dictionary/'+index,()=>typeError(callee,()=>call(value)));
+ }
+ }
+ }
+ globalThis.__geometryPointOrderResults={complete:true,total:checks.length,passed:checks.filter(row=>row.passed).length,checks};
+ globalThis.__uiEventResults=globalThis.__geometryPointOrderResults;
+ return true;
+})()
diff --git a/moli-renderer-v8/src/script_vm/tests/geometry_point_conversion_order.rs b/moli-renderer-v8/src/script_vm/tests/geometry_point_conversion_order.rs
new file mode 100644
index 000000000..d503c0db4
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/geometry_point_conversion_order.rs
@@ -0,0 +1,38 @@
+use super::*;
+
+#[test]
+fn geometry_point_dictionaries_follow_webidl_member_and_exception_order() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://geometry-point-order.test/");
+ vm.eval("document.body.innerHTML = '<iframe></iframe>'")
+ .unwrap();
+ vm.eval(include_str!("geometry_point_conversion_order.js"))
+ .unwrap();
+ assert_eq!(
+ vm.eval("__geometryPointOrderResults.complete").unwrap(),
+ "true"
+ );
+ assert_eq!(
+ vm.eval("__geometryPointOrderResults.total").unwrap(),
+ "1344"
+ );
+ assert_eq!(
+ vm.eval("JSON.stringify(__geometryPointOrderResults.checks.filter(row => !row.passed))")
+ .unwrap(),
+ "[]"
+ );
+}
+
+#[test]
+fn svg_text_point_argument_is_optional_and_converted_after_receiver_validation() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://svg-text-point-args.test/");
+ vm.eval("document.body.innerHTML = '<iframe></iframe>'")
+ .unwrap();
+ vm.eval(include_str!("svg_text_point_args.js")).unwrap();
+ assert_eq!(vm.eval("__svgTextPointResults.complete").unwrap(), "true");
+ assert_eq!(vm.eval("__svgTextPointResults.total").unwrap(), "896");
+ assert_eq!(
+ vm.eval("JSON.stringify(__svgTextPointResults.checks.filter(row => !row.passed))")
+ .unwrap(),
+ "[]"
+ );
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index bcc5edf26..50fc9f050 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -2145,6 +2145,7 @@ mod dom_xhr;
mod element_click;
mod encoded_video_chunk_shell;
mod event_receivers;
+mod geometry_point_conversion_order;
mod headers_list;
mod http_fixture;
mod media_owner_playback_interfaces;
diff --git a/moli-renderer-v8/src/script_vm/tests/svg_text_point_args.js b/moli-renderer-v8/src/script_vm/tests/svg_text_point_args.js
new file mode 100644
index 000000000..cd68198fd
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/svg_text_point_args.js
@@ -0,0 +1,24 @@
+(() => {
+ const checks=[],ns='http://www.w3.org/2000/svg';
+ const check=(name,fn)=>{try {checks.push({name,passed:fn()===true});}catch(error){checks.push({name,passed:false,error:String(error)});}};
+ const realms=[window,document.querySelector('iframe').contentWindow];
+ const typeError=(realm,fn)=>{try {fn();}catch(error){return Object.getPrototypeOf(error)===realm.TypeError.prototype;}return false;};
+ for(const [ownerIndex,owner] of realms.entries()) {
+ const docs=[owner.document,owner.document.implementation.createHTMLDocument(''),owner.document.implementation.createDocument(ns,'svg'),new owner.DOMParser().parseFromString('<svg xmlns="'+ns+'"/>','image/svg+xml')];
+ for(const [docIndex,doc] of docs.entries())for(const [calleeIndex,callee] of realms.entries())for(const tag of ['text','tspan']) {
+ const element=doc.createElementNS(ns,tag),fn=callee.SVGTextContentElement.prototype.getCharNumAtPosition,prefix=`text-point/${ownerIndex}/${docIndex}/${calleeIndex}/${tag}`;
+ check(prefix+'/arity',()=>fn.length===0);
+ check(prefix+'/omitted',()=>fn.call(element)===-1);
+ for(const [index,value] of [undefined,null,{},[],()=>{}, {x:1,y:2}, {x:NaN,y:Infinity,z:-Infinity,w:0}].entries())check(prefix+'/dictionary/'+index,()=>fn.call(element,value)===-1);
+ for(const [index,value] of [0,true,'text',Symbol(),1n].entries())check(prefix+'/primitive/'+index,()=>typeError(callee,()=>fn.call(element,value)));
+ check(prefix+'/member-order',()=>{const order=[],point={};for(const name of ['w','x','y','z'])Object.defineProperty(point,name,{get(){order.push(name);return {valueOf(){order.push(name+'-number');return 1;}};}});return fn.call(element,point)===-1 && order.join(',')==='w,w-number,x,x-number,y,y-number,z,z-number';});
+ for(const name of ['w','x','y','z'])check(prefix+'/exception/'+name,()=>{const sentinel={},order=[],point={};for(const key of ['w','x','y','z'])Object.defineProperty(point,key,{get(){order.push(key);if(key===name)throw sentinel;return 0;}});try{fn.call(element,point);}catch(error){return error===sentinel && order.join(',')===['w','x','y','z'].slice(0,['w','x','y','z'].indexOf(name)+1).join(',');}return false;});
+ check(prefix+'/ignored-extra',()=>{let n=0;return fn.call(element,{}, {get x(){n++;throw 1;}})===-1 && n===0;});
+ let traps=0;const handler={get(){traps++;throw 1;},getPrototypeOf(){traps++;throw 2;}},author=new owner.Proxy(element,handler),revoked=owner.Proxy.revocable(element,handler);revoked.revoke();
+ for(const [index,receiver] of [null,{},Object.create(element),Object.create(callee.SVGTextContentElement.prototype),author,revoked.proxy,doc,doc.createElementNS(ns,'g')].entries())check(prefix+'/brand/'+index,()=>{let n=0;return typeError(callee,()=>fn.call(receiver,{get x(){n++;throw 1;}})) && n===0 && traps===0;});
+ }
+ }
+ globalThis.__svgTextPointResults={complete:true,total:checks.length,passed:checks.filter(row=>row.passed).length,checks};
+ globalThis.__uiEventResults=globalThis.__svgTextPointResults;
+ return true;
+})()