From dbff26bce05d404027ef5bbfd85fb5995e4726bc Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Sun, 28 May 2023 22:43:55 -0400 Subject: Support arbitrary protos when wrapping DOM objects with constructors. --- components/script/dom/node.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) (limited to 'components/script/dom/node.rs') diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index a7186806785..4908fc65e9b 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -26,7 +26,7 @@ use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::{Castable, CharacterDataTypeId, ElementTypeId}; use crate::dom::bindings::inheritance::{EventTargetTypeId, HTMLElementTypeId, NodeTypeId}; use crate::dom::bindings::inheritance::{SVGElementTypeId, SVGGraphicsElementTypeId, TextTypeId}; -use crate::dom::bindings::reflector::{reflect_dom_object, DomObject, DomObjectWrap}; +use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, DomObjectWrap}; use crate::dom::bindings::root::{Dom, DomRoot, DomSlice, LayoutDom, MutNullableDom}; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::bindings::xmlname::namespace_from_domstring; @@ -70,6 +70,7 @@ use dom_struct::dom_struct; use euclid::default::{Point2D, Rect, Size2D, Vector2D}; use html5ever::{Namespace, Prefix, QualName}; use js::jsapi::JSObject; +use js::rust::HandleObject; use libc::{self, c_void, uintptr_t}; use malloc_size_of::{MallocSizeOf, MallocSizeOfOps}; use msg::constellation_msg::{BrowsingContextId, PipelineId}; @@ -1753,11 +1754,18 @@ fn as_uintptr(t: &T) -> uintptr_t { impl Node { pub fn reflect_node(node: Box, document: &Document) -> DomRoot + where + N: DerivedFrom + DomObject + DomObjectWrap, + { + Self::reflect_node_with_proto(node, document, None) + } + + pub fn reflect_node_with_proto(node: Box, document: &Document, proto: Option) -> DomRoot where N: DerivedFrom + DomObject + DomObjectWrap, { let window = document.window(); - reflect_dom_object(node, window) + reflect_dom_object2(node, window, proto) } pub fn new_inherited(doc: &Document) -> Node { @@ -2290,6 +2298,7 @@ impl Node { &document, ElementCreator::ScriptCreated, CustomElementCreationMode::Asynchronous, + None, ); DomRoot::upcast::(element) }, -- cgit v1.2.3