Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(dom): expose object child browsing context

ldm03476f0fee851
diff --git a/moli-renderer-v8/src/native_bridge/element.rs b/moli-renderer-v8/src/native_bridge/element.rs
index e2042fe41..cfa04ea1f 100644
--- a/moli-renderer-v8/src/native_bridge/element.rs
+++ b/moli-renderer-v8/src/native_bridge/element.rs
@@ -3240,7 +3240,7 @@ fn iframe_srcdoc_setter_function<'s>(
rv.set_undefined();
}
-fn iframe_content_document_getter_function<'s>(
+fn frame_owner_content_document_getter_function<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
@@ -3306,7 +3306,7 @@ fn iframe_content_document_getter_function<'s>(
}
}
-fn iframe_content_window_getter_function<'s>(
+fn frame_owner_content_window_getter_function<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
@@ -3367,6 +3367,44 @@ fn iframe_content_window_getter_function<'s>(
}
}
+fn object_content_document_getter_function<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ rv: v8::ReturnValue<'_, v8::Value>,
+) {
+ if html_element_getter_receiver(
+ scope,
+ args.this(),
+ "HTMLObjectElement",
+ "contentDocument",
+ "object",
+ )
+ .is_none()
+ {
+ return;
+ }
+ frame_owner_content_document_getter_function(scope, args, rv);
+}
+
+fn object_content_window_getter_function<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ rv: v8::ReturnValue<'_, v8::Value>,
+) {
+ if html_element_getter_receiver(
+ scope,
+ args.this(),
+ "HTMLObjectElement",
+ "contentWindow",
+ "object",
+ )
+ .is_none()
+ {
+ return;
+ }
+ frame_owner_content_window_getter_function(scope, args, rv);
+}
+
#[derive(WebApiFunctionTemplate)]
#[webapi(name = "HTMLScriptElement", enumerable)]
struct HtmlScriptElementPrototypeDeclaration {
@@ -3991,9 +4029,17 @@ struct HtmlIFrameElementPrototypeDeclaration {
setter_data = NullToEmptyDomStringReflection::IframeMarginWidth
)]
margin_width: (),
- #[webapi(accessor_property, getter = iframe_content_document_getter_function, receiver = super::receivers::html_iframe_element)]
+ #[webapi(
+ accessor_property,
+ getter = frame_owner_content_document_getter_function,
+ receiver = super::receivers::html_iframe_element
+ )]
content_document: (),
- #[webapi(accessor_property, getter = iframe_content_window_getter_function, receiver = super::receivers::html_iframe_element)]
+ #[webapi(
+ accessor_property,
+ getter = frame_owner_content_window_getter_function,
+ receiver = super::receivers::html_iframe_element
+ )]
content_window: (),
}
@@ -5234,6 +5280,16 @@ struct HtmlObjectElementPrototypeDeclaration {
setter_data = DomStringReflection::ObjectHeight
)]
height: (),
+ #[webapi(
+ accessor_property,
+ getter = object_content_document_getter_function
+ )]
+ content_document: (),
+ #[webapi(
+ accessor_property,
+ getter = object_content_window_getter_function
+ )]
+ content_window: (),
#[webapi(
accessor_property,
getter = html_border_getter_function,
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/detached.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/detached.rs
index 443719fa0..77bb2ffba 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/detached.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/detached.rs
@@ -5667,6 +5667,14 @@ fn detached_object_param_and_data_accessors_use_owner_prototypes() {
assert(descriptor.enumerable === true, `${name} enumerable`);
assert(descriptor.configurable === true, `${name} configurable`);
};
+ const readonlyAccessor = (prototype, name) => {
+ const descriptor = Object.getOwnPropertyDescriptor(prototype, name);
+ assert(!!descriptor, `${prototype.constructor.name}.${name} descriptor missing`);
+ assert(typeof descriptor.get === "function", `${name} getter`);
+ assert(descriptor.set === undefined, `${name} setter absent`);
+ assert(descriptor.enumerable === true, `${name} enumerable`);
+ assert(descriptor.configurable === true, `${name} configurable`);
+ };
const absent = (prototype, name) => {
assert(
Object.getOwnPropertyDescriptor(prototype, name) === undefined,
@@ -5689,6 +5697,22 @@ fn detached_object_param_and_data_accessors_use_owner_prototypes() {
assert(!own(object, name), `object.${name} should not be own`);
assert(!(name in div), `div.${name} should be absent`);
}
+ for (const name of ["contentDocument", "contentWindow"]) {
+ readonlyAccessor(HTMLObjectElement.prototype, name);
+ absent(HTMLElement.prototype, name);
+ assert(!own(object, name), `object.${name} should not be own`);
+ assert(!(name in div), `div.${name} should be absent`);
+ assert(object[name] === null, `detached object.${name} should be null`);
+ const getter = Object.getOwnPropertyDescriptor(HTMLObjectElement.prototype, name).get;
+ assert(getter.call(object) === null, `borrowed object.${name} getter`);
+ for (const receiver of [div, document.createElement("iframe"), {}, null,
+ HTMLObjectElement.prototype,
+ document.createElementNS("http://www.w3.org/2000/svg", "object")]) {
+ let rejected = false;
+ try { getter.call(receiver); } catch (error) { rejected = error instanceof TypeError; }
+ assert(rejected, `${name} must reject an incompatible receiver`);
+ }
+ }
for (const name of ["value", "type", "valueType"]) {
accessor(HTMLParamElement.prototype, name);
absent(HTMLElement.prototype, name);
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document.rs
index 086a808bc..f24fceb75 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document.rs
@@ -1720,7 +1720,7 @@ fn detached_specialized_element_surfaces_are_inherited() {
[id("menu"), ["compact"], "menu"],
[id("meta"), ["content", "httpEquiv", "media", "name"], "meta"],
[id("meter"), ["high", "labels", "low", "max", "min", "optimum", "value"], "meter"],
- [id("object"), ["archive", "border", "code", "codeBase", "codeType", "data", "declare", "form", "hspace", "name", "standby", "type", "useMap", "validity", "validationMessage", "vspace", "willValidate", "checkValidity", "reportValidity", "setCustomValidity"], "object"],
+ [id("object"), ["archive", "border", "code", "codeBase", "codeType", "contentDocument", "contentWindow", "data", "declare", "form", "hspace", "name", "standby", "type", "useMap", "validity", "validationMessage", "vspace", "willValidate", "checkValidity", "reportValidity", "setCustomValidity"], "object"],
[id("ol"), ["compact", "reversed", "start", "type"], "ol"],
[id("optgroup"), ["disabled", "label"], "optgroup"],
[id("option"), ["defaultSelected", "disabled", "form", "index", "label", "selected", "text", "value"], "option"],
@@ -3442,6 +3442,14 @@ fn object_param_and_data_accessors_live_on_owner_prototypes() {
assert(descriptor.enumerable === true, `${name} enumerable`);
assert(descriptor.configurable === true, `${name} configurable`);
};
+ const readonlyAccessor = (prototype, name) => {
+ const descriptor = Object.getOwnPropertyDescriptor(prototype, name);
+ assert(!!descriptor, `${prototype.constructor.name}.${name} descriptor missing`);
+ assert(typeof descriptor.get === "function", `${name} getter`);
+ assert(descriptor.set === undefined, `${name} setter absent`);
+ assert(descriptor.enumerable === true, `${name} enumerable`);
+ assert(descriptor.configurable === true, `${name} configurable`);
+ };
const absent = (prototype, name) => {
assert(
Object.getOwnPropertyDescriptor(prototype, name) === undefined,
@@ -3470,6 +3478,12 @@ fn object_param_and_data_accessors_live_on_owner_prototypes() {
assert(!own(object, name), `object.${name} should not be own`);
assert(!(name in div), `div.${name} should be absent`);
}
+ for (const name of ["contentDocument", "contentWindow"]) {
+ readonlyAccessor(HTMLObjectElement.prototype, name);
+ absent(HTMLElement.prototype, name);
+ assert(!own(object, name), `object.${name} should not be own`);
+ assert(!(name in div), `div.${name} should be absent`);
+ }
for (const name of ["value", "type", "valueType"]) {
accessor(HTMLParamElement.prototype, name);
absent(HTMLElement.prototype, name);
diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rs
index 21e895ec6..c64ce4a11 100644
--- a/moli-renderer-v8/src/script_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs
@@ -5783,6 +5783,25 @@ fn embedded_frame_owners_create_child_contexts_only_for_document_content() {
vm.eval(
r#"
(() => {
+ const object = document.getElementById("accepted-object");
+ const contentDocument = object.contentDocument;
+ const contentWindow = object.contentWindow;
+ return [
+ contentDocument !== null,
+ contentWindow !== null,
+ contentDocument === contentWindow.document
+ ].join("|");
+})()
+"#,
+ )
+ .expect("object child browsing context accessors should evaluate"),
+ "true|true|true"
+ );
+
+ assert_eq!(
+ vm.eval(
+ r#"
+(() => {
document.getElementById("accepted-embed").type = "image/png";
document.getElementById("accepted-object").data = "/image.png";
return "reclassified";