diff options
Diffstat (limited to 'components/script/dom')
113 files changed, 254 insertions, 228 deletions
diff --git a/components/script/dom/analysernode.rs b/components/script/dom/analysernode.rs index ac703adcea7..568d2b120e8 100644 --- a/components/script/dom/analysernode.rs +++ b/components/script/dom/analysernode.rs @@ -14,7 +14,7 @@ use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{ use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::num::Finite; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::window::Window; use crate::task_source::TaskSource; @@ -105,7 +105,7 @@ impl AnalyserNode { options: &AnalyserOptions, ) -> Fallible<DomRoot<AnalyserNode>> { let (node, recv) = AnalyserNode::new_inherited(window, context, options)?; - let object = reflect_dom_object2(Box::new(node), window, proto); + let object = reflect_dom_object_with_proto(Box::new(node), window, proto); let (source, canceller) = window .task_manager() .dom_manipulation_task_source_with_canceller(); diff --git a/components/script/dom/animationevent.rs b/components/script/dom/animationevent.rs index d41fff988b5..cde3d466da3 100644 --- a/components/script/dom/animationevent.rs +++ b/components/script/dom/animationevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::AnimationEventBinding::{ use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -45,7 +45,11 @@ impl AnimationEvent { type_: Atom, init: &AnimationEventInit, ) -> DomRoot<AnimationEvent> { - let ev = reflect_dom_object2(Box::new(AnimationEvent::new_inherited(init)), window, proto); + let ev = reflect_dom_object_with_proto( + Box::new(AnimationEvent::new_inherited(init)), + window, + proto, + ); { let event = ev.upcast::<Event>(); event.init_event(type_, init.parent.bubbles, init.parent.cancelable); diff --git a/components/script/dom/audiobuffer.rs b/components/script/dom/audiobuffer.rs index cbc00b250e1..bad4bf87141 100644 --- a/components/script/dom/audiobuffer.rs +++ b/components/script/dom/audiobuffer.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::AudioBufferBinding::{ }; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::globalscope::GlobalScope; use crate::dom::window::Window; @@ -104,7 +104,7 @@ impl AudioBuffer { initial_data: Option<&[Vec<f32>]>, ) -> DomRoot<AudioBuffer> { let buffer = AudioBuffer::new_inherited(number_of_channels, length, sample_rate); - let buffer = reflect_dom_object2(Box::new(buffer), global, proto); + let buffer = reflect_dom_object_with_proto(Box::new(buffer), global, proto); buffer.set_initial_data(initial_data); buffer } diff --git a/components/script/dom/audiobuffersourcenode.rs b/components/script/dom/audiobuffersourcenode.rs index affbe4797fe..ce1880bccd9 100644 --- a/components/script/dom/audiobuffersourcenode.rs +++ b/components/script/dom/audiobuffersourcenode.rs @@ -13,7 +13,7 @@ use crate::dom::bindings::codegen::Bindings::AudioScheduledSourceNodeBinding::Au use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -109,7 +109,7 @@ impl AudioBufferSourceNode { options: &AudioBufferSourceOptions, ) -> Fallible<DomRoot<AudioBufferSourceNode>> { let node = AudioBufferSourceNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/audiocontext.rs b/components/script/dom/audiocontext.rs index 305c8cd4092..914323509a2 100644 --- a/components/script/dom/audiocontext.rs +++ b/components/script/dom/audiocontext.rs @@ -17,7 +17,7 @@ use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; use crate::dom::bindings::refcounted::{Trusted, TrustedPromise}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::htmlmediaelement::HTMLMediaElement; use crate::dom::mediaelementaudiosourcenode::MediaElementAudioSourceNode; @@ -87,7 +87,7 @@ impl AudioContext { ) -> DomRoot<AudioContext> { let pipeline_id = window.pipeline_id(); let context = AudioContext::new_inherited(options, pipeline_id); - let context = reflect_dom_object2(Box::new(context), window, proto); + let context = reflect_dom_object_with_proto(Box::new(context), window, proto); context.resume(); context } diff --git a/components/script/dom/bindings/interface.rs b/components/script/dom/bindings/interface.rs index 940562ba471..13658ca6410 100644 --- a/components/script/dom/bindings/interface.rs +++ b/components/script/dom/bindings/interface.rs @@ -11,8 +11,8 @@ use crate::dom::bindings::conversions::{get_dom_class, DOM_OBJECT_SLOT}; use crate::dom::bindings::guard::Guard; use crate::dom::bindings::principals::ServoJSPrincipals; use crate::dom::bindings::utils::{ - get_proto_or_iface_array, DOMJSClass, ProtoOrIfaceArray, DOM_PROTOTYPE_SLOT, JSCLASS_DOM_GLOBAL, - callargs_is_constructing, + callargs_is_constructing, get_proto_or_iface_array, DOMJSClass, ProtoOrIfaceArray, + DOM_PROTOTYPE_SLOT, JSCLASS_DOM_GLOBAL, }; use crate::script_runtime::JSContext as SafeJSContext; use js::error::throw_type_error; diff --git a/components/script/dom/bindings/reflector.rs b/components/script/dom/bindings/reflector.rs index dfdbe5fd145..c0f1305bf6c 100644 --- a/components/script/dom/bindings/reflector.rs +++ b/components/script/dom/bindings/reflector.rs @@ -26,7 +26,11 @@ where unsafe { T::WRAP(GlobalScope::get_cx(), global_scope, None, obj) } } -pub fn reflect_dom_object2<T, U>(obj: Box<T>, global: &U, proto: Option<HandleObject>) -> DomRoot<T> +pub fn reflect_dom_object_with_proto<T, U>( + obj: Box<T>, + global: &U, + proto: Option<HandleObject>, +) -> DomRoot<T> where T: DomObject + DomObjectWrap, U: DerivedFrom<GlobalScope>, diff --git a/components/script/dom/biquadfilternode.rs b/components/script/dom/biquadfilternode.rs index 6359383d2ac..197afaef36b 100644 --- a/components/script/dom/biquadfilternode.rs +++ b/components/script/dom/biquadfilternode.rs @@ -13,7 +13,7 @@ use crate::dom::bindings::codegen::Bindings::BiquadFilterNodeBinding::BiquadFilt use crate::dom::bindings::codegen::Bindings::BiquadFilterNodeBinding::BiquadFilterOptions; use crate::dom::bindings::codegen::Bindings::BiquadFilterNodeBinding::BiquadFilterType; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -121,7 +121,7 @@ impl BiquadFilterNode { options: &BiquadFilterOptions, ) -> Fallible<DomRoot<BiquadFilterNode>> { let node = BiquadFilterNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 9400d9f133d..b2127f071a0 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::BlobBinding; use crate::dom::bindings::codegen::Bindings::BlobBinding::BlobMethods; use crate::dom::bindings::codegen::UnionTypes::ArrayBufferOrArrayBufferViewOrBlobOrString; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::serializable::{Serializable, StorageKey}; use crate::dom::bindings::str::DOMString; @@ -48,7 +48,7 @@ impl Blob { blob_impl: BlobImpl, ) -> DomRoot<Blob> { let dom_blob = - reflect_dom_object2(Box::new(Blob::new_inherited(&blob_impl)), global, proto); + reflect_dom_object_with_proto(Box::new(Blob::new_inherited(&blob_impl)), global, proto); global.track_blob(&dom_blob, blob_impl); dom_blob } diff --git a/components/script/dom/bluetoothadvertisingevent.rs b/components/script/dom/bluetoothadvertisingevent.rs index 0110b898222..cc667e75a4b 100644 --- a/components/script/dom/bluetoothadvertisingevent.rs +++ b/components/script/dom/bluetoothadvertisingevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::BluetoothAdvertisingEventBinding::B use crate::dom::bindings::codegen::Bindings::EventBinding::EventBinding::EventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::bluetoothdevice::BluetoothDevice; @@ -60,7 +60,7 @@ impl BluetoothAdvertisingEvent { txPower: Option<i8>, rssi: Option<i8>, ) -> DomRoot<BluetoothAdvertisingEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(BluetoothAdvertisingEvent::new_inherited( device, name, appearance, txPower, rssi, )), diff --git a/components/script/dom/broadcastchannel.rs b/components/script/dom/broadcastchannel.rs index 17c56827fcb..458ed299e85 100644 --- a/components/script/dom/broadcastchannel.rs +++ b/components/script/dom/broadcastchannel.rs @@ -4,7 +4,7 @@ use crate::dom::bindings::codegen::Bindings::BroadcastChannelBinding::BroadcastChannelMethods; use crate::dom::bindings::error::{Error, ErrorResult}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::structuredclone; @@ -41,7 +41,7 @@ impl BroadcastChannel { proto: Option<HandleObject>, name: DOMString, ) -> DomRoot<BroadcastChannel> { - let channel = reflect_dom_object2( + let channel = reflect_dom_object_with_proto( Box::new(BroadcastChannel::new_inherited(name)), global, proto, diff --git a/components/script/dom/channelmergernode.rs b/components/script/dom/channelmergernode.rs index e57543019f6..7cafb8b44b6 100644 --- a/components/script/dom/channelmergernode.rs +++ b/components/script/dom/channelmergernode.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{ }; use crate::dom::bindings::codegen::Bindings::ChannelMergerNodeBinding::ChannelMergerOptions; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -69,7 +69,7 @@ impl ChannelMergerNode { options: &ChannelMergerOptions, ) -> Fallible<DomRoot<ChannelMergerNode>> { let node = ChannelMergerNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/channelsplitternode.rs b/components/script/dom/channelsplitternode.rs index ca9477be9fa..077b256ffd8 100644 --- a/components/script/dom/channelsplitternode.rs +++ b/components/script/dom/channelsplitternode.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{ }; use crate::dom::bindings::codegen::Bindings::ChannelSplitterNodeBinding::ChannelSplitterOptions; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -71,7 +71,7 @@ impl ChannelSplitterNode { options: &ChannelSplitterOptions, ) -> Fallible<DomRoot<ChannelSplitterNode>> { let node = ChannelSplitterNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 24609621633..62a0a066f61 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::CloseEventBinding::CloseEventMethod use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -60,7 +60,7 @@ impl CloseEvent { reason: DOMString, ) -> DomRoot<CloseEvent> { let event = Box::new(CloseEvent::new_inherited(wasClean, code, reason)); - let ev = reflect_dom_object2(event, global, proto); + let ev = reflect_dom_object_with_proto(event, global, proto); { let event = ev.upcast::<Event>(); event.init_event(type_, bool::from(bubbles), bool::from(cancelable)); diff --git a/components/script/dom/compositionevent.rs b/components/script/dom/compositionevent.rs index 6739df7a576..05058a3a0cf 100644 --- a/components/script/dom/compositionevent.rs +++ b/components/script/dom/compositionevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::CompositionEventBinding::{ }; use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object, reflect_dom_object2}; +use crate::dom::bindings::reflector::{reflect_dom_object, reflect_dom_object_with_proto}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::uievent::UIEvent; @@ -57,7 +57,7 @@ impl CompositionEvent { detail: i32, data: DOMString, ) -> DomRoot<CompositionEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(CompositionEvent { uievent: UIEvent::new_inherited(), data: data, diff --git a/components/script/dom/constantsourcenode.rs b/components/script/dom/constantsourcenode.rs index be1125bb283..cbde279923d 100644 --- a/components/script/dom/constantsourcenode.rs +++ b/components/script/dom/constantsourcenode.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::AudioParamBinding::AutomationRate; use crate::dom::bindings::codegen::Bindings::ConstantSourceNodeBinding::ConstantSourceNodeMethods; use crate::dom::bindings::codegen::Bindings::ConstantSourceNodeBinding::ConstantSourceOptions; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -74,7 +74,7 @@ impl ConstantSourceNode { options: &ConstantSourceOptions, ) -> Fallible<DomRoot<ConstantSourceNode>> { let node = ConstantSourceNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index 8b5c2ec14d0..4004adebd82 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::CustomEventBinding::CustomEventMeth use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -45,7 +45,7 @@ impl CustomEvent { global: &GlobalScope, proto: Option<HandleObject>, ) -> DomRoot<CustomEvent> { - reflect_dom_object2(Box::new(CustomEvent::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(CustomEvent::new_inherited()), global, proto) } fn new( diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index eb7862b8211..a7a99695147 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -31,7 +31,7 @@ use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::{Castable, ElementTypeId, HTMLElementTypeId, NodeTypeId}; use crate::dom::bindings::num::Finite; use crate::dom::bindings::refcounted::{Trusted, TrustedPromise}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot, DomSlice, LayoutDom, MutNullableDom}; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::bindings::xmlname::XMLName::InvalidXMLName; @@ -3322,7 +3322,7 @@ impl Document { referrer_policy: Option<ReferrerPolicy>, canceller: FetchCanceller, ) -> DomRoot<Document> { - let document = reflect_dom_object2( + let document = reflect_dom_object_with_proto( Box::new(Document::new_inherited( window, has_browsing_context, diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 6252837b66c..e5462fa4376 100644 --- a/components/script/dom/domexception.rs +++ b/components/script/dom/domexception.rs @@ -5,7 +5,9 @@ use crate::dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionConstants; use crate::dom::bindings::codegen::Bindings::DOMExceptionBinding::DOMExceptionMethods; use crate::dom::bindings::error::Error; -use crate::dom::bindings::reflector::{reflect_dom_object, reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{ + reflect_dom_object, reflect_dom_object_with_proto, Reflector, +}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; @@ -144,7 +146,7 @@ impl DOMException { message: DOMString, name: DOMString, ) -> Result<DomRoot<DOMException>, Error> { - Ok(reflect_dom_object2( + Ok(reflect_dom_object_with_proto( Box::new(DOMException::new_inherited(message, name)), global, proto, diff --git a/components/script/dom/dommatrix.rs b/components/script/dom/dommatrix.rs index 54948489d11..c37ba3dfc79 100644 --- a/components/script/dom/dommatrix.rs +++ b/components/script/dom/dommatrix.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::UnionTypes::StringOrUnrestrictedDoubleSequenc use crate::dom::bindings::error; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::dommatrixreadonly::{ dommatrixinit_to_matrix, entries_to_matrix, transform_to_matrix, DOMMatrixReadOnly, @@ -39,7 +39,7 @@ impl DOMMatrix { matrix: Transform3D<f64>, ) -> DomRoot<Self> { let dommatrix = Self::new_inherited(is2D, matrix); - reflect_dom_object2(Box::new(dommatrix), global, proto) + reflect_dom_object_with_proto(Box::new(dommatrix), global, proto) } pub fn new_inherited(is2D: bool, matrix: Transform3D<f64>) -> Self { diff --git a/components/script/dom/dommatrixreadonly.rs b/components/script/dom/dommatrixreadonly.rs index 3b99a7a21b7..cd0cdb058a1 100644 --- a/components/script/dom/dommatrixreadonly.rs +++ b/components/script/dom/dommatrixreadonly.rs @@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::UnionTypes::StringOrUnrestrictedDoubleSequenc use crate::dom::bindings::error; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::dommatrix::DOMMatrix; use crate::dom::dompoint::DOMPoint; @@ -52,7 +52,7 @@ impl DOMMatrixReadOnly { matrix: Transform3D<f64>, ) -> DomRoot<Self> { let dommatrix = Self::new_inherited(is2D, matrix); - reflect_dom_object2(Box::new(dommatrix), global, proto) + reflect_dom_object_with_proto(Box::new(dommatrix), global, proto) } pub fn new_inherited(is2D: bool, matrix: Transform3D<f64>) -> Self { diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index 13db9b60f41..9562a32d844 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -12,7 +12,7 @@ use crate::dom::bindings::codegen::Bindings::DOMParserBinding::SupportedType::Te use crate::dom::bindings::codegen::Bindings::DocumentBinding::DocumentReadyState; use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::document::DocumentSource; @@ -38,7 +38,7 @@ impl DOMParser { } fn new(window: &Window, proto: Option<HandleObject>) -> DomRoot<DOMParser> { - reflect_dom_object2(Box::new(DOMParser::new_inherited(window)), window, proto) + reflect_dom_object_with_proto(Box::new(DOMParser::new_inherited(window)), window, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/dompoint.rs b/components/script/dom/dompoint.rs index 79b0ea2b86a..1398712076b 100644 --- a/components/script/dom/dompoint.rs +++ b/components/script/dom/dompoint.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOMPointMethods}; use crate::dom::bindings::codegen::Bindings::DOMPointReadOnlyBinding::DOMPointReadOnlyMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::dompointreadonly::{DOMPointReadOnly, DOMPointWriteMethods}; use crate::dom::globalscope::GlobalScope; @@ -38,7 +38,7 @@ impl DOMPoint { z: f64, w: f64, ) -> DomRoot<DOMPoint> { - reflect_dom_object2(Box::new(DOMPoint::new_inherited(x, y, z, w)), global, proto) + reflect_dom_object_with_proto(Box::new(DOMPoint::new_inherited(x, y, z, w)), global, proto) } pub fn Constructor( diff --git a/components/script/dom/dompointreadonly.rs b/components/script/dom/dompointreadonly.rs index 77819e917fd..2e5386a367d 100644 --- a/components/script/dom/dompointreadonly.rs +++ b/components/script/dom/dompointreadonly.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::DOMPointBinding::DOMPointInit; use crate::dom::bindings::codegen::Bindings::DOMPointReadOnlyBinding::DOMPointReadOnlyMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::globalscope::GlobalScope; use dom_struct::dom_struct; @@ -46,7 +46,7 @@ impl DOMPointReadOnly { z: f64, w: f64, ) -> DomRoot<DOMPointReadOnly> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(DOMPointReadOnly::new_inherited(x, y, z, w)), global, proto, diff --git a/components/script/dom/domquad.rs b/components/script/dom/domquad.rs index 6cb4653b21f..f015b09ee1c 100644 --- a/components/script/dom/domquad.rs +++ b/components/script/dom/domquad.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::DOMPointBinding::{DOMPointInit, DOM use crate::dom::bindings::codegen::Bindings::DOMQuadBinding::{DOMQuadInit, DOMQuadMethods}; use crate::dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::DOMRectInit; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::dompoint::DOMPoint; use crate::dom::domrect::DOMRect; @@ -54,7 +54,7 @@ impl DOMQuad { p3: &DOMPoint, p4: &DOMPoint, ) -> DomRoot<DOMQuad> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(DOMQuad::new_inherited(p1, p2, p3, p4)), global, proto, diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs index 6836b12127f..5fa5db8a606 100644 --- a/components/script/dom/domrect.rs +++ b/components/script/dom/domrect.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::DOMRectBinding::DOMRectMethods; use crate::dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::DOMRectReadOnlyMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::domrectreadonly::DOMRectReadOnly; use crate::dom::globalscope::GlobalScope; @@ -36,7 +36,7 @@ impl DOMRect { width: f64, height: f64, ) -> DomRoot<DOMRect> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(DOMRect::new_inherited(x, y, width, height)), global, proto, diff --git a/components/script/dom/domrectreadonly.rs b/components/script/dom/domrectreadonly.rs index 80bb793857d..09461954285 100644 --- a/components/script/dom/domrectreadonly.rs +++ b/components/script/dom/domrectreadonly.rs @@ -4,7 +4,7 @@ use crate::dom::bindings::codegen::Bindings::DOMRectReadOnlyBinding::DOMRectReadOnlyMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::globalscope::GlobalScope; use dom_struct::dom_struct; @@ -39,7 +39,7 @@ impl DOMRectReadOnly { width: f64, height: f64, ) -> DomRoot<DOMRectReadOnly> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(DOMRectReadOnly::new_inherited(x, y, width, height)), global, proto, diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index 6f5daebed37..cc8664849df 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::ErrorEventBinding::ErrorEventMethod use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -46,7 +46,7 @@ impl ErrorEvent { } fn new_uninitialized(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<ErrorEvent> { - reflect_dom_object2(Box::new(ErrorEvent::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(ErrorEvent::new_inherited()), global, proto) } pub fn new( diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index 48467485dfb..417170eac2e 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -12,7 +12,7 @@ use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::document::Document; @@ -80,7 +80,7 @@ impl Event { global: &GlobalScope, proto: Option<HandleObject>, ) -> DomRoot<Event> { - reflect_dom_object2(Box::new(Event::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(Event::new_inherited()), global, proto) } pub fn new( diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index 639eba4f949..f451545f491 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::EventSourceBinding::{ use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -466,7 +466,7 @@ impl EventSource { url: ServoUrl, with_credentials: bool, ) -> DomRoot<EventSource> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(EventSource::new_inherited(url, with_credentials)), global, proto, diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 0ed9d2c10ba..65375632d6c 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -21,7 +21,7 @@ use crate::dom::bindings::codegen::UnionTypes::EventListenerOptionsOrBoolean; use crate::dom::bindings::codegen::UnionTypes::EventOrString; use crate::dom::bindings::error::{report_pending_exception, Error, Fallible}; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::element::Element; @@ -356,7 +356,7 @@ impl EventTarget { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<EventTarget> { - reflect_dom_object2(Box::new(EventTarget::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(EventTarget::new_inherited()), global, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/extendableevent.rs b/components/script/dom/extendableevent.rs index a19190ebd03..2ba241a8b8a 100644 --- a/components/script/dom/extendableevent.rs +++ b/components/script/dom/extendableevent.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::{self, EventMethods}; use crate::dom::bindings::codegen::Bindings::ExtendableEventBinding; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -48,7 +48,11 @@ impl ExtendableEvent { bubbles: bool, cancelable: bool, ) -> DomRoot<ExtendableEvent> { - let ev = reflect_dom_object2(Box::new(ExtendableEvent::new_inherited()), worker, proto); + let ev = reflect_dom_object_with_proto( + Box::new(ExtendableEvent::new_inherited()), + worker, + proto, + ); { let event = ev.upcast::<Event>(); event.init_event(type_, bubbles, cancelable); diff --git a/components/script/dom/extendablemessageevent.rs b/components/script/dom/extendablemessageevent.rs index 2d22e00be94..8c5812f9d91 100644 --- a/components/script/dom/extendablemessageevent.rs +++ b/components/script/dom/extendablemessageevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::ExtendableMessageEventBinding; use crate::dom::bindings::codegen::Bindings::ExtendableMessageEventBinding::ExtendableMessageEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -102,7 +102,7 @@ impl ExtendableMessageEvent { lastEventId, ports, )); - let ev = reflect_dom_object2(ev, global, proto); + let ev = reflect_dom_object_with_proto(ev, global, proto); { let event = ev.upcast::<Event>(); event.init_event(type_, bubbles, cancelable); diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 946677d5b35..53ca5fafb02 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::FileBinding::FileMethods; use crate::dom::bindings::codegen::UnionTypes::ArrayBufferOrArrayBufferViewOrBlobOrString; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::blob::{blob_parts_to_bytes, normalize_type_string, Blob}; @@ -59,7 +59,7 @@ impl File { name: DOMString, modified: Option<i64>, ) -> DomRoot<File> { - let file = reflect_dom_object2( + let file = reflect_dom_object_with_proto( Box::new(File::new_inherited(&blob_impl, name, modified)), global, proto, diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index b89440ab600..5a1a880c274 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -11,7 +11,7 @@ use crate::dom::bindings::codegen::UnionTypes::StringOrObject; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -153,7 +153,7 @@ impl FileReader { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<FileReader> { - reflect_dom_object2(Box::new(FileReader::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(FileReader::new_inherited()), global, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/filereadersync.rs b/components/script/dom/filereadersync.rs index d92a161759b..a2f375ef80a 100644 --- a/components/script/dom/filereadersync.rs +++ b/components/script/dom/filereadersync.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::BlobBinding::BlobMethods; use crate::dom::bindings::codegen::Bindings::FileReaderSyncBinding::FileReaderSyncMethods; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::blob::Blob; @@ -32,7 +32,7 @@ impl FileReaderSync { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<FileReaderSync> { - reflect_dom_object2(Box::new(FileReaderSync::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(FileReaderSync::new_inherited()), global, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/focusevent.rs b/components/script/dom/focusevent.rs index d31059b09cc..d980ea6ed49 100644 --- a/components/script/dom/focusevent.rs +++ b/components/script/dom/focusevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::FocusEventBinding::FocusEventMethod use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::event::{EventBubbles, EventCancelable}; @@ -40,7 +40,7 @@ impl FocusEvent { window: &Window, proto: Option<HandleObject>, ) -> DomRoot<FocusEvent> { - reflect_dom_object2(Box::new(FocusEvent::new_inherited()), window, proto) + reflect_dom_object_with_proto(Box::new(FocusEvent::new_inherited()), window, proto) } pub fn new( diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index c4234ff83e7..af810e2d888 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::UnionTypes::FileOrUSVString; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::iterable::Iterable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::blob::Blob; @@ -51,7 +51,7 @@ impl FormData { global: &GlobalScope, proto: Option<HandleObject>, ) -> DomRoot<FormData> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(FormData::new_inherited(form_datums)), global, proto, diff --git a/components/script/dom/formdataevent.rs b/components/script/dom/formdataevent.rs index 2f4b765290c..1b78bd1af9c 100644 --- a/components/script/dom/formdataevent.rs +++ b/components/script/dom/formdataevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::FormDataEventBinding; use crate::dom::bindings::codegen::Bindings::FormDataEventBinding::FormDataEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -44,7 +44,7 @@ impl FormDataEvent { cancelable: EventCancelable, form_data: &FormData, ) -> DomRoot<FormDataEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(FormDataEvent { event: Event::new_inherited(), form_data: Dom::from_ref(form_data), diff --git a/components/script/dom/gainnode.rs b/components/script/dom/gainnode.rs index 9b3910cf31a..f5d8a8f793f 100644 --- a/components/script/dom/gainnode.rs +++ b/components/script/dom/gainnode.rs @@ -11,7 +11,7 @@ use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{ use crate::dom::bindings::codegen::Bindings::AudioParamBinding::AutomationRate; use crate::dom::bindings::codegen::Bindings::GainNodeBinding::{GainNodeMethods, GainOptions}; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -77,7 +77,7 @@ impl GainNode { options: &GainOptions, ) -> Fallible<DomRoot<GainNode>> { let node = GainNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/gamepadevent.rs b/components/script/dom/gamepadevent.rs index 1553b2eb039..ec6da6ba302 100644 --- a/components/script/dom/gamepadevent.rs +++ b/components/script/dom/gamepadevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::GamepadEventBinding; use crate::dom::bindings::codegen::Bindings::GamepadEventBinding::GamepadEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -55,7 +55,7 @@ impl GamepadEvent { cancelable: bool, gamepad: &Gamepad, ) -> DomRoot<GamepadEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(GamepadEvent::new_inherited(&gamepad)), global, proto, diff --git a/components/script/dom/gpuoutofmemoryerror.rs b/components/script/dom/gpuoutofmemoryerror.rs index 5b6e7053397..c7ba07b1e6e 100644 --- a/components/script/dom/gpuoutofmemoryerror.rs +++ b/components/script/dom/gpuoutofmemoryerror.rs @@ -2,7 +2,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::globalscope::GlobalScope; use dom_struct::dom_struct; @@ -25,7 +25,7 @@ impl GPUOutOfMemoryError { } fn new_with_proto(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<Self> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(GPUOutOfMemoryError::new_inherited()), global, proto, diff --git a/components/script/dom/gpuuncapturederrorevent.rs b/components/script/dom/gpuuncapturederrorevent.rs index bdf62162dfe..e5c590fdd68 100644 --- a/components/script/dom/gpuuncapturederrorevent.rs +++ b/components/script/dom/gpuuncapturederrorevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::GPUUncapturedErrorEventBinding::{ GPUUncapturedErrorEventInit, GPUUncapturedErrorEventMethods, }; use crate::dom::bindings::codegen::Bindings::GPUValidationErrorBinding::GPUError; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -45,7 +45,7 @@ impl GPUUncapturedErrorEvent { type_: DOMString, init: &GPUUncapturedErrorEventInit, ) -> DomRoot<Self> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(GPUUncapturedErrorEvent::new_inherited(init)), global, proto, diff --git a/components/script/dom/gpuvalidationerror.rs b/components/script/dom/gpuvalidationerror.rs index 40c75c31ec6..412b30f5862 100644 --- a/components/script/dom/gpuvalidationerror.rs +++ b/components/script/dom/gpuvalidationerror.rs @@ -3,7 +3,7 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::codegen::Bindings::GPUValidationErrorBinding::GPUValidationErrorMethods; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; @@ -33,7 +33,7 @@ impl GPUValidationError { proto: Option<HandleObject>, message: DOMString, ) -> DomRoot<Self> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(GPUValidationError::new_inherited(message)), global, proto, diff --git a/components/script/dom/hashchangeevent.rs b/components/script/dom/hashchangeevent.rs index 18557444bdd..e93f8a94476 100644 --- a/components/script/dom/hashchangeevent.rs +++ b/components/script/dom/hashchangeevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::HashChangeEventBinding; use crate::dom::bindings::codegen::Bindings::HashChangeEventBinding::HashChangeEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::event::Event; @@ -41,7 +41,7 @@ impl HashChangeEvent { window: &Window, proto: Option<HandleObject>, ) -> DomRoot<HashChangeEvent> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(HashChangeEvent::new_inherited(String::new(), String::new())), window, proto, @@ -68,7 +68,7 @@ impl HashChangeEvent { old_url: String, new_url: String, ) -> DomRoot<HashChangeEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(HashChangeEvent::new_inherited(old_url, new_url)), window, proto, diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs index 8cae2df36a1..a2e2d4acdac 100644 --- a/components/script/dom/headers.rs +++ b/components/script/dom/headers.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::HeadersBinding::{HeadersInit, HeadersMethods}; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::iterable::Iterable; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{is_token, ByteString}; use crate::dom::globalscope::GlobalScope; @@ -52,7 +52,7 @@ impl Headers { } fn new_with_proto(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<Headers> { - reflect_dom_object2(Box::new(Headers::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(Headers::new_inherited()), global, proto) } // https://fetch.spec.whatwg.org/#dom-headers diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 27129559475..434b2f20252 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -4,7 +4,7 @@ use crate::dom::bindings::codegen::Bindings::ImageDataBinding::ImageDataMethods; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::globalscope::GlobalScope; use crate::script_runtime::JSContext; @@ -91,7 +91,7 @@ impl ImageData { (*imagedata).data.set(jsobject); - Ok(reflect_dom_object2(imagedata, global, proto)) + Ok(reflect_dom_object_with_proto(imagedata, global, proto)) } #[allow(unsafe_code)] @@ -119,7 +119,7 @@ impl ImageData { .unwrap(); (*imagedata).data.set(array.get()); - Ok(reflect_dom_object2(imagedata, global, proto)) + Ok(reflect_dom_object_with_proto(imagedata, global, proto)) } // https://html.spec.whatwg.org/multipage/#pixel-manipulation:dom-imagedata-3 #[allow(unsafe_code, non_snake_case)] diff --git a/components/script/dom/inputevent.rs b/components/script/dom/inputevent.rs index 2c1ee15cbae..d96f64327b6 100644 --- a/components/script/dom/inputevent.rs +++ b/components/script/dom/inputevent.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::InputEventBinding::{self, InputEventMethods}; use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::uievent::UIEvent; @@ -32,7 +32,7 @@ impl InputEvent { data: Option<DOMString>, is_composing: bool, ) -> DomRoot<InputEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(InputEvent { uievent: UIEvent::new_inherited(), data: data, diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index 1a247c46287..8e31868fca8 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::KeyboardEventBinding::KeyboardEvent use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -60,7 +60,7 @@ impl KeyboardEvent { window: &Window, proto: Option<HandleObject>, ) -> DomRoot<KeyboardEvent> { - reflect_dom_object2(Box::new(KeyboardEvent::new_inherited()), window, proto) + reflect_dom_object_with_proto(Box::new(KeyboardEvent::new_inherited()), window, proto) } pub fn new( diff --git a/components/script/dom/mediaelementaudiosourcenode.rs b/components/script/dom/mediaelementaudiosourcenode.rs index 98f43a063be..79746215559 100644 --- a/components/script/dom/mediaelementaudiosourcenode.rs +++ b/components/script/dom/mediaelementaudiosourcenode.rs @@ -7,7 +7,7 @@ use crate::dom::audionode::AudioNode; use crate::dom::bindings::codegen::Bindings::MediaElementAudioSourceNodeBinding::MediaElementAudioSourceNodeMethods; use crate::dom::bindings::codegen::Bindings::MediaElementAudioSourceNodeBinding::MediaElementAudioSourceOptions; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::htmlmediaelement::HTMLMediaElement; use crate::dom::window::Window; @@ -65,7 +65,7 @@ impl MediaElementAudioSourceNode { media_element: &HTMLMediaElement, ) -> Fallible<DomRoot<MediaElementAudioSourceNode>> { let node = MediaElementAudioSourceNode::new_inherited(context, media_element)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/mediametadata.rs b/components/script/dom/mediametadata.rs index 94e41bc058d..8e931dd0b4b 100644 --- a/components/script/dom/mediametadata.rs +++ b/components/script/dom/mediametadata.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::MediaMetadataBinding::MediaMetadataInit; use crate::dom::bindings::codegen::Bindings::MediaMetadataBinding::MediaMetadataMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::mediasession::MediaSession; @@ -43,7 +43,7 @@ impl MediaMetadata { proto: Option<HandleObject>, init: &MediaMetadataInit, ) -> DomRoot<MediaMetadata> { - reflect_dom_object2(Box::new(MediaMetadata::new_inherited(init)), global, proto) + reflect_dom_object_with_proto(Box::new(MediaMetadata::new_inherited(init)), global, proto) } /// https://w3c.github.io/mediasession/#dom-mediametadata-mediametadata diff --git a/components/script/dom/mediaquerylistevent.rs b/components/script/dom/mediaquerylistevent.rs index fdeedc93052..c58dd3aee5c 100644 --- a/components/script/dom/mediaquerylistevent.rs +++ b/components/script/dom/mediaquerylistevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQu use crate::dom::bindings::codegen::Bindings::MediaQueryListEventBinding::MediaQueryListEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -38,7 +38,7 @@ impl MediaQueryListEvent { media: media, matches: Cell::new(matches), }); - reflect_dom_object2(ev, global, proto) + reflect_dom_object_with_proto(ev, global, proto) } pub fn new( diff --git a/components/script/dom/mediastream.rs b/components/script/dom/mediastream.rs index b633fbb8915..5e1b1dc5970 100644 --- a/components/script/dom/mediastream.rs +++ b/components/script/dom/mediastream.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::cell::{DomRefCell, Ref}; use crate::dom::bindings::codegen::Bindings::MediaStreamBinding::MediaStreamMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::eventtarget::EventTarget; @@ -37,7 +37,7 @@ impl MediaStream { } fn new_with_proto(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<MediaStream> { - reflect_dom_object2(Box::new(MediaStream::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(MediaStream::new_inherited()), global, proto) } pub fn new_single( diff --git a/components/script/dom/mediastreamaudiodestinationnode.rs b/components/script/dom/mediastreamaudiodestinationnode.rs index b42fb9d89f8..c7d060fb6a6 100644 --- a/components/script/dom/mediastreamaudiodestinationnode.rs +++ b/components/script/dom/mediastreamaudiodestinationnode.rs @@ -11,7 +11,7 @@ use crate::dom::bindings::codegen::Bindings::AudioNodeBinding::{ use crate::dom::bindings::codegen::Bindings::MediaStreamAudioDestinationNodeBinding::MediaStreamAudioDestinationNodeMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::mediastream::MediaStream; use crate::dom::window::Window; @@ -70,7 +70,7 @@ impl MediaStreamAudioDestinationNode { options: &AudioNodeOptions, ) -> Fallible<DomRoot<MediaStreamAudioDestinationNode>> { let node = MediaStreamAudioDestinationNode::new_inherited(context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/mediastreamaudiosourcenode.rs b/components/script/dom/mediastreamaudiosourcenode.rs index 4137b0c2896..4ac4e8cf9b4 100644 --- a/components/script/dom/mediastreamaudiosourcenode.rs +++ b/components/script/dom/mediastreamaudiosourcenode.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::MediaStreamAudioSourceNodeBinding:: }; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::mediastream::MediaStream; use crate::dom::window::Window; @@ -65,7 +65,7 @@ impl MediaStreamAudioSourceNode { stream: &MediaStream, ) -> Fallible<DomRoot<MediaStreamAudioSourceNode>> { let node = MediaStreamAudioSourceNode::new_inherited(context, stream)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/mediastreamtrackaudiosourcenode.rs b/components/script/dom/mediastreamtrackaudiosourcenode.rs index b311d2f8058..c5023d24abc 100644 --- a/components/script/dom/mediastreamtrackaudiosourcenode.rs +++ b/components/script/dom/mediastreamtrackaudiosourcenode.rs @@ -7,7 +7,7 @@ use crate::dom::audionode::AudioNode; use crate::dom::bindings::codegen::Bindings::MediaStreamTrackAudioSourceNodeBinding::MediaStreamTrackAudioSourceOptions; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::mediastreamtrack::MediaStreamTrack; use crate::dom::window::Window; @@ -56,7 +56,7 @@ impl MediaStreamTrackAudioSourceNode { track: &MediaStreamTrack, ) -> Fallible<DomRoot<MediaStreamTrackAudioSourceNode>> { let node = MediaStreamTrackAudioSourceNode::new_inherited(context, track)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/messagechannel.rs b/components/script/dom/messagechannel.rs index a973dccf4de..0b74c0e60d8 100644 --- a/components/script/dom/messagechannel.rs +++ b/components/script/dom/messagechannel.rs @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ use crate::dom::bindings::codegen::Bindings::MessageChannelBinding::MessageChannelMethods; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::globalscope::GlobalScope; use crate::dom::messageport::MessagePort; @@ -45,7 +45,7 @@ impl MessageChannel { ); // Steps 4-6 - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(MessageChannel::new_inherited(&*port1, &*port2)), incumbent, proto, diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 45a7cf03288..2e9f17cc31b 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::MessageEventBinding::MessageEventMe use crate::dom::bindings::codegen::UnionTypes::WindowProxyOrMessagePortOrServiceWorker; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -124,7 +124,7 @@ impl MessageEvent { lastEventId, ports, )); - let ev = reflect_dom_object2(ev, global, proto); + let ev = reflect_dom_object_with_proto(ev, global, proto); ev.data.set(data.get()); ev diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index 7f9992ab88e..137ccbc7673 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::MouseEventBinding::MouseEventMethod use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -79,7 +79,7 @@ impl MouseEvent { window: &Window, proto: Option<HandleObject>, ) -> DomRoot<MouseEvent> { - reflect_dom_object2(Box::new(MouseEvent::new_inherited()), window, proto) + reflect_dom_object_with_proto(Box::new(MouseEvent::new_inherited()), window, proto) } pub fn new( diff --git a/components/script/dom/mutationobserver.rs b/components/script/dom/mutationobserver.rs index 01adc5241a7..0adac701253 100644 --- a/components/script/dom/mutationobserver.rs +++ b/components/script/dom/mutationobserver.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::MutationObserverBinding::MutationCa use crate::dom::bindings::codegen::Bindings::MutationObserverBinding::MutationObserverBinding::MutationObserverMethods; use crate::dom::bindings::codegen::Bindings::MutationObserverBinding::MutationObserverInit; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::mutationrecord::MutationRecord; @@ -71,7 +71,7 @@ impl MutationObserver { callback: Rc<MutationCallback>, ) -> DomRoot<MutationObserver> { let boxed_observer = Box::new(MutationObserver::new_inherited(callback)); - reflect_dom_object2(boxed_observer, global, proto) + reflect_dom_object_with_proto(boxed_observer, global, proto) } fn new_inherited(callback: Rc<MutationCallback>) -> MutationObserver { diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 873e7225229..c98e9b93bfe 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_object2, DomObject, DomObjectWrap}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, 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; @@ -1769,7 +1769,7 @@ impl Node { N: DerivedFrom<Node> + DomObject + DomObjectWrap, { let window = document.window(); - reflect_dom_object2(node, window, proto) + reflect_dom_object_with_proto(node, window, proto) } pub fn new_inherited(doc: &Document) -> Node { diff --git a/components/script/dom/offlineaudiocompletionevent.rs b/components/script/dom/offlineaudiocompletionevent.rs index ae77c5e96d3..f5c39d5bfd4 100644 --- a/components/script/dom/offlineaudiocompletionevent.rs +++ b/components/script/dom/offlineaudiocompletionevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::OfflineAudioCompletionEventBinding: use crate::dom::bindings::codegen::Bindings::OfflineAudioCompletionEventBinding::OfflineAudioCompletionEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -50,7 +50,7 @@ impl OfflineAudioCompletionEvent { rendered_buffer: &AudioBuffer, ) -> DomRoot<OfflineAudioCompletionEvent> { let event = Box::new(OfflineAudioCompletionEvent::new_inherited(rendered_buffer)); - let ev = reflect_dom_object2(event, window, proto); + let ev = reflect_dom_object_with_proto(event, window, proto); { let event = ev.upcast::<Event>(); event.init_event(type_, bool::from(bubbles), bool::from(cancelable)); diff --git a/components/script/dom/offlineaudiocontext.rs b/components/script/dom/offlineaudiocontext.rs index 243020f213e..29e3335eeae 100644 --- a/components/script/dom/offlineaudiocontext.rs +++ b/components/script/dom/offlineaudiocontext.rs @@ -13,7 +13,7 @@ use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::event::{Event, EventBubbles, EventCancelable}; use crate::dom::offlineaudiocompletionevent::OfflineAudioCompletionEvent; @@ -87,7 +87,11 @@ impl OfflineAudioContext { let pipeline_id = window.pipeline_id(); let context = OfflineAudioContext::new_inherited(channel_count, length, sample_rate, pipeline_id); - Ok(reflect_dom_object2(Box::new(context), window, proto)) + Ok(reflect_dom_object_with_proto( + Box::new(context), + window, + proto, + )) } pub fn Constructor( diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs index c607099e04c..0a03f91c4cc 100644 --- a/components/script/dom/offscreencanvas.rs +++ b/components/script/dom/offscreencanvas.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::OffscreenCanvasBinding::{ OffscreenCanvasMethods, OffscreenRenderingContext, }; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; @@ -63,7 +63,7 @@ impl OffscreenCanvas { height: u64, placeholder: Option<&HTMLCanvasElement>, ) -> DomRoot<OffscreenCanvas> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(OffscreenCanvas::new_inherited(width, height, placeholder)), global, proto, diff --git a/components/script/dom/oscillatornode.rs b/components/script/dom/oscillatornode.rs index febc8f95d01..4f7c59a2e4d 100644 --- a/components/script/dom/oscillatornode.rs +++ b/components/script/dom/oscillatornode.rs @@ -14,7 +14,7 @@ use crate::dom::bindings::codegen::Bindings::OscillatorNodeBinding::{ OscillatorOptions, OscillatorType, }; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -98,7 +98,7 @@ impl OscillatorNode { options: &OscillatorOptions, ) -> Fallible<DomRoot<OscillatorNode>> { let node = OscillatorNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/pagetransitionevent.rs b/components/script/dom/pagetransitionevent.rs index c35e24d1628..c924c70c475 100644 --- a/components/script/dom/pagetransitionevent.rs +++ b/components/script/dom/pagetransitionevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::PageTransitionEventBinding; use crate::dom::bindings::codegen::Bindings::PageTransitionEventBinding::PageTransitionEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -36,7 +36,7 @@ impl PageTransitionEvent { window: &Window, proto: Option<HandleObject>, ) -> DomRoot<PageTransitionEvent> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(PageTransitionEvent::new_inherited()), window, proto, diff --git a/components/script/dom/pannernode.rs b/components/script/dom/pannernode.rs index 22d411878d9..3d1b4d6d112 100644 --- a/components/script/dom/pannernode.rs +++ b/components/script/dom/pannernode.rs @@ -20,7 +20,7 @@ use crate::dom::bindings::codegen::Bindings::PannerNodeBinding::{ use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -187,7 +187,7 @@ impl PannerNode { options: &PannerOptions, ) -> Fallible<DomRoot<PannerNode>> { let node = PannerNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/performanceobserver.rs b/components/script/dom/performanceobserver.rs index 2701f488a68..ca83fe7d361 100644 --- a/components/script/dom/performanceobserver.rs +++ b/components/script/dom/performanceobserver.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::PerformanceObserverBinding::Perform use crate::dom::bindings::codegen::Bindings::PerformanceObserverBinding::PerformanceObserverInit; use crate::dom::bindings::codegen::Bindings::PerformanceObserverBinding::PerformanceObserverMethods; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::console::Console; @@ -80,7 +80,7 @@ impl PerformanceObserver { entries: DOMPerformanceEntryList, ) -> DomRoot<PerformanceObserver> { let observer = PerformanceObserver::new_inherited(callback, DomRefCell::new(entries)); - reflect_dom_object2(Box::new(observer), global, proto) + reflect_dom_object_with_proto(Box::new(observer), global, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/popstateevent.rs b/components/script/dom/popstateevent.rs index b6095389791..9d6b2c24c7f 100644 --- a/components/script/dom/popstateevent.rs +++ b/components/script/dom/popstateevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::PopStateEventBinding; use crate::dom::bindings::codegen::Bindings::PopStateEventBinding::PopStateEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -38,7 +38,7 @@ impl PopStateEvent { } fn new_uninitialized(window: &Window, proto: Option<HandleObject>) -> DomRoot<PopStateEvent> { - reflect_dom_object2(Box::new(PopStateEvent::new_inherited()), window, proto) + reflect_dom_object_with_proto(Box::new(PopStateEvent::new_inherited()), window, proto) } fn new( diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index e70d3e1db07..93e687e53b3 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::ProgressEventBinding; use crate::dom::bindings::codegen::Bindings::ProgressEventBinding::ProgressEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -65,7 +65,7 @@ impl ProgressEvent { loaded: u64, total: u64, ) -> DomRoot<ProgressEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(ProgressEvent::new_inherited( length_computable, loaded, diff --git a/components/script/dom/promiserejectionevent.rs b/components/script/dom/promiserejectionevent.rs index c136cf8d46a..0ac02f8c439 100644 --- a/components/script/dom/promiserejectionevent.rs +++ b/components/script/dom/promiserejectionevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::PromiseRejectionEventBinding; use crate::dom::bindings::codegen::Bindings::PromiseRejectionEventBinding::PromiseRejectionEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::RootedTraceableBox; @@ -62,7 +62,7 @@ impl PromiseRejectionEvent { promise: Rc<Promise>, reason: HandleValue, ) -> DomRoot<Self> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(PromiseRejectionEvent::new_inherited(promise)), global, proto, diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index e5d731702ad..0a150866dd8 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -14,7 +14,7 @@ use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::inheritance::{CharacterDataTypeId, NodeTypeId}; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot, MutDom}; use crate::dom::bindings::str::DOMString; use crate::dom::bindings::trace::JSTraceable; @@ -97,7 +97,7 @@ impl Range { end_container: &Node, end_offset: u32, ) -> DomRoot<Range> { - let range = reflect_dom_object2( + let range = reflect_dom_object_with_proto( Box::new(Range::new_inherited( start_container, start_offset, diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index 10737e93555..da9b57aab13 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -16,7 +16,7 @@ use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestMethods; use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestMode; use crate::dom::bindings::codegen::Bindings::RequestBinding::RequestRedirect; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::{ByteString, DOMString, USVString}; use crate::dom::bindings::trace::RootedTraceableBox; @@ -64,7 +64,7 @@ impl Request { } fn new(global: &GlobalScope, proto: Option<HandleObject>, url: ServoUrl) -> DomRoot<Request> { - reflect_dom_object2(Box::new(Request::new_inherited(global, url)), global, proto) + reflect_dom_object_with_proto(Box::new(Request::new_inherited(global, url)), global, proto) } // https://fetch.spec.whatwg.org/#dom-request diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs index b42f3cc014f..dbfd1653fd6 100644 --- a/components/script/dom/response.rs +++ b/components/script/dom/response.rs @@ -12,7 +12,7 @@ use crate::dom::bindings::codegen::Bindings::ResponseBinding::{ }; use crate::dom::bindings::codegen::Bindings::XMLHttpRequestBinding::BodyInit; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::{ByteString, USVString}; use crate::dom::globalscope::GlobalScope; @@ -79,7 +79,7 @@ impl Response { } fn new_with_proto(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<Response> { - reflect_dom_object2(Box::new(Response::new_inherited(global)), global, proto) + reflect_dom_object_with_proto(Box::new(Response::new_inherited(global)), global, proto) } // https://fetch.spec.whatwg.org/#initialize-a-response diff --git a/components/script/dom/rtcdatachannelevent.rs b/components/script/dom/rtcdatachannelevent.rs index c8e5ab8c457..7008f4f630e 100644 --- a/components/script/dom/rtcdatachannelevent.rs +++ b/components/script/dom/rtcdatachannelevent.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::codegen::Bindings::RTCDataChannelEventBinding::RTCDataChannelEventInit; use crate::dom::bindings::codegen::Bindings::RTCDataChannelEventBinding::RTCDataChannelEventMethods; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -49,7 +49,7 @@ impl RTCDataChannelEvent { cancelable: bool, channel: &RTCDataChannel, ) -> DomRoot<RTCDataChannelEvent> { - let event = reflect_dom_object2( + let event = reflect_dom_object_with_proto( Box::new(RTCDataChannelEvent::new_inherited(&channel)), global, proto, diff --git a/components/script/dom/rtcerror.rs b/components/script/dom/rtcerror.rs index 060e5445b75..bb1bb9c1225 100644 --- a/components/script/dom/rtcerror.rs +++ b/components/script/dom/rtcerror.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::RTCErrorBinding::RTCErrorDetailType; use crate::dom::bindings::codegen::Bindings::RTCErrorBinding::RTCErrorInit; use crate::dom::bindings::codegen::Bindings::RTCErrorBinding::RTCErrorMethods; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::domexception::{DOMErrorName, DOMException}; @@ -51,7 +51,7 @@ impl RTCError { init: &RTCErrorInit, message: DOMString, ) -> DomRoot<RTCError> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(RTCError::new_inherited(global, init, message)), global, proto, diff --git a/components/script/dom/rtcerrorevent.rs b/components/script/dom/rtcerrorevent.rs index 0a4a47c5d5b..de95817e759 100644 --- a/components/script/dom/rtcerrorevent.rs +++ b/components/script/dom/rtcerrorevent.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::codegen::Bindings::RTCErrorEventBinding::RTCErrorEventInit; use crate::dom::bindings::codegen::Bindings::RTCErrorEventBinding::RTCErrorEventMethods; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -49,7 +49,7 @@ impl RTCErrorEvent { cancelable: bool, error: &RTCError, ) -> DomRoot<RTCErrorEvent> { - let event = reflect_dom_object2( + let event = reflect_dom_object_with_proto( Box::new(RTCErrorEvent::new_inherited(&error)), global, proto, diff --git a/components/script/dom/rtcicecandidate.rs b/components/script/dom/rtcicecandidate.rs index afc7954e70e..0346224d19b 100644 --- a/components/script/dom/rtcicecandidate.rs +++ b/components/script/dom/rtcicecandidate.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::RTCIceCandidateBinding::RTCIceCandidateInit; use crate::dom::bindings::codegen::Bindings::RTCIceCandidateBinding::RTCIceCandidateMethods; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::{DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; @@ -64,7 +64,7 @@ impl RTCIceCandidate { sdp_m_line_index: Option<u16>, username_fragment: Option<DOMString>, ) -> DomRoot<RTCIceCandidate> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(RTCIceCandidate::new_inherited( candidate, sdp_m_id, diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs index d600c0d8770..df954136867 100644 --- a/components/script/dom/rtcpeerconnection.rs +++ b/components/script/dom/rtcpeerconnection.rs @@ -18,7 +18,7 @@ use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::{Trusted, TrustedPromise}; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::bindings::str::USVString; @@ -198,7 +198,11 @@ impl RTCPeerConnection { proto: Option<HandleObject>, config: &RTCConfiguration, ) -> DomRoot<RTCPeerConnection> { - let this = reflect_dom_object2(Box::new(RTCPeerConnection::new_inherited()), global, proto); + let this = reflect_dom_object_with_proto( + Box::new(RTCPeerConnection::new_inherited()), + global, + proto, + ); let signaller = this.make_signaller(); *this.controller.borrow_mut() = Some(ServoMedia::get().unwrap().create_webrtc(signaller)); if let Some(ref servers) = config.iceServers { diff --git a/components/script/dom/rtcpeerconnectioniceevent.rs b/components/script/dom/rtcpeerconnectioniceevent.rs index 8fbe1564960..e0cae1d6bb6 100644 --- a/components/script/dom/rtcpeerconnectioniceevent.rs +++ b/components/script/dom/rtcpeerconnectioniceevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::RTCPeerConnectionIceEventBinding::R use crate::dom::bindings::codegen::Bindings::RTCPeerConnectionIceEventBinding::RTCPeerConnectionIceEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; @@ -56,7 +56,7 @@ impl RTCPeerConnectionIceEvent { url: Option<DOMString>, trusted: bool, ) -> DomRoot<RTCPeerConnectionIceEvent> { - let e = reflect_dom_object2( + let e = reflect_dom_object_with_proto( Box::new(RTCPeerConnectionIceEvent::new_inherited(candidate, url)), global, proto, diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 83a5e9d998c..07feb795d7f 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::RTCSessionDescriptionBinding::{ RTCSdpType, RTCSessionDescriptionInit, }; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::{DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; @@ -38,7 +38,7 @@ impl RTCSessionDescription { ty: RTCSdpType, sdp: DOMString, ) -> DomRoot<RTCSessionDescription> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(RTCSessionDescription::new_inherited(ty, sdp)), global, proto, diff --git a/components/script/dom/rtctrackevent.rs b/components/script/dom/rtctrackevent.rs index e96808170b5..74eebf49e97 100644 --- a/components/script/dom/rtctrackevent.rs +++ b/components/script/dom/rtctrackevent.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventBinding::EventMe use crate::dom::bindings::codegen::Bindings::RTCTrackEventBinding::{self, RTCTrackEventMethods}; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -50,7 +50,7 @@ impl RTCTrackEvent { cancelable: bool, track: &MediaStreamTrack, ) -> DomRoot<RTCTrackEvent> { - let trackevent = reflect_dom_object2( + let trackevent = reflect_dom_object_with_proto( Box::new(RTCTrackEvent::new_inherited(&track)), global, proto, diff --git a/components/script/dom/stereopannernode.rs b/components/script/dom/stereopannernode.rs index 318308f6abf..96d5e8014bc 100644 --- a/components/script/dom/stereopannernode.rs +++ b/components/script/dom/stereopannernode.rs @@ -12,7 +12,7 @@ use crate::dom::bindings::codegen::Bindings::AudioParamBinding::AutomationRate; use crate::dom::bindings::codegen::Bindings::StereoPannerNodeBinding::StereoPannerNodeMethods; use crate::dom::bindings::codegen::Bindings::StereoPannerNodeBinding::StereoPannerOptions; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::window::Window; use dom_struct::dom_struct; @@ -86,7 +86,7 @@ impl StereoPannerNode { options: &StereoPannerOptions, ) -> Fallible<DomRoot<StereoPannerNode>> { let node = StereoPannerNode::new_inherited(window, context, options)?; - Ok(reflect_dom_object2(Box::new(node), window, proto)) + Ok(reflect_dom_object_with_proto(Box::new(node), window, proto)) } #[allow(non_snake_case)] diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index c63b9f80f60..e9bc8e73063 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::StorageEventBinding; use crate::dom::bindings::codegen::Bindings::StorageEventBinding::StorageEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -56,7 +56,7 @@ impl StorageEvent { proto: Option<HandleObject>, url: DOMString, ) -> DomRoot<StorageEvent> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(StorageEvent::new_inherited(None, None, None, url, None)), window, proto, @@ -100,7 +100,7 @@ impl StorageEvent { url: DOMString, storageArea: Option<&Storage>, ) -> DomRoot<StorageEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(StorageEvent::new_inherited( key, oldValue, diff --git a/components/script/dom/submitevent.rs b/components/script/dom/submitevent.rs index 522e225b233..01db87705b3 100644 --- a/components/script/dom/submitevent.rs +++ b/components/script/dom/submitevent.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventMethods; use crate::dom::bindings::codegen::Bindings::SubmitEventBinding; use crate::dom::bindings::codegen::Bindings::SubmitEventBinding::SubmitEventMethods; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -50,7 +50,7 @@ impl SubmitEvent { cancelable: bool, submitter: Option<DomRoot<HTMLElement>>, ) -> DomRoot<SubmitEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(SubmitEvent::new_inherited(submitter)), global, proto, diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 55eeb858fa9..369b9a8a058 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -40,7 +40,7 @@ use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::num::Finite; use crate::dom::bindings::record::Record; use crate::dom::bindings::refcounted::TrustedPromise; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{ByteString, DOMString, USVString}; use crate::dom::bindings::trace::RootedTraceableBox; @@ -85,7 +85,7 @@ impl TestBinding { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<TestBinding> { - reflect_dom_object2(Box::new(TestBinding::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(TestBinding::new_inherited()), global, proto) } pub fn Constructor( diff --git a/components/script/dom/testbindingiterable.rs b/components/script/dom/testbindingiterable.rs index 0dd37f9950c..bfbc4478cc2 100644 --- a/components/script/dom/testbindingiterable.rs +++ b/components/script/dom/testbindingiterable.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::TestBindingIterableBinding::TestBindingIterableMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; @@ -22,7 +22,7 @@ pub struct TestBindingIterable { impl TestBindingIterable { fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<TestBindingIterable> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(TestBindingIterable { reflector: Reflector::new(), vals: DomRefCell::new(vec![]), diff --git a/components/script/dom/testbindingpairiterable.rs b/components/script/dom/testbindingpairiterable.rs index 0bf11198298..4f394ce84bb 100644 --- a/components/script/dom/testbindingpairiterable.rs +++ b/components/script/dom/testbindingpairiterable.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::TestBindingPairIterableBinding::TestBindingPairIterableMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::iterable::Iterable; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; @@ -49,7 +49,7 @@ impl Iterable for TestBindingPairIterable { impl TestBindingPairIterable { fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<TestBindingPairIterable> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(TestBindingPairIterable { reflector: Reflector::new(), map: DomRefCell::new(vec![]), diff --git a/components/script/dom/testworklet.rs b/components/script/dom/testworklet.rs index 09fd53243e7..f9d5591758a 100644 --- a/components/script/dom/testworklet.rs +++ b/components/script/dom/testworklet.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::TestWorkletBinding::TestWorkletMeth use crate::dom::bindings::codegen::Bindings::WorkletBinding::WorkletBinding::WorkletMethods; use crate::dom::bindings::codegen::Bindings::WorkletBinding::WorkletOptions; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::Reflector; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; @@ -38,7 +38,7 @@ impl TestWorklet { fn new(window: &Window, proto: Option<HandleObject>) -> DomRoot<TestWorklet> { let worklet = Worklet::new(window, WorkletGlobalScopeType::Test); - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(TestWorklet::new_inherited(&*worklet)), window, proto, diff --git a/components/script/dom/textdecoder.rs b/components/script/dom/textdecoder.rs index b81fd538c6b..67d9d8790ea 100644 --- a/components/script/dom/textdecoder.rs +++ b/components/script/dom/textdecoder.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::TextDecoderBinding::{ }; use crate::dom::bindings::codegen::UnionTypes::ArrayBufferViewOrArrayBuffer; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::globalscope::GlobalScope; @@ -62,7 +62,7 @@ impl TextDecoder { fatal: bool, ignoreBOM: bool, ) -> DomRoot<TextDecoder> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(TextDecoder::new_inherited(encoding, fatal, ignoreBOM)), global, proto, diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs index 86d65fa9111..3956683c0e4 100644 --- a/components/script/dom/textencoder.rs +++ b/components/script/dom/textencoder.rs @@ -4,7 +4,7 @@ use crate::dom::bindings::codegen::Bindings::TextEncoderBinding::TextEncoderMethods; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::globalscope::GlobalScope; @@ -29,7 +29,7 @@ impl TextEncoder { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<TextEncoder> { - reflect_dom_object2(Box::new(TextEncoder::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(TextEncoder::new_inherited()), global, proto) } // https://encoding.spec.whatwg.org/#dom-textencoder diff --git a/components/script/dom/trackevent.rs b/components/script/dom/trackevent.rs index 7959574938e..f8766b766f8 100644 --- a/components/script/dom/trackevent.rs +++ b/components/script/dom/trackevent.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::TrackEventBinding::TrackEventMethod use crate::dom::bindings::codegen::UnionTypes::VideoTrackOrAudioTrackOrTextTrack; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -76,7 +76,11 @@ impl TrackEvent { cancelable: bool, track: &Option<VideoTrackOrAudioTrackOrTextTrack>, ) -> DomRoot<TrackEvent> { - let te = reflect_dom_object2(Box::new(TrackEvent::new_inherited(&track)), global, proto); + let te = reflect_dom_object_with_proto( + Box::new(TrackEvent::new_inherited(&track)), + global, + proto, + ); { let event = te.upcast::<Event>(); event.init_event(type_, bubbles, cancelable); diff --git a/components/script/dom/transitionevent.rs b/components/script/dom/transitionevent.rs index cb0c6a81b11..ab32fefc1c3 100644 --- a/components/script/dom/transitionevent.rs +++ b/components/script/dom/transitionevent.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::TransitionEventBinding::{ use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -50,7 +50,7 @@ impl TransitionEvent { type_: Atom, init: &TransitionEventInit, ) -> DomRoot<TransitionEvent> { - let ev = reflect_dom_object2( + let ev = reflect_dom_object_with_proto( Box::new(TransitionEvent::new_inherited(init)), window, proto, diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index 0c8aa52cb13..57950f6bf87 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::UIEventBinding; use crate::dom::bindings::codegen::Bindings::UIEventBinding::UIEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -43,7 +43,7 @@ impl UIEvent { window: &Window, proto: Option<HandleObject>, ) -> DomRoot<UIEvent> { - reflect_dom_object2(Box::new(UIEvent::new_inherited()), window, proto) + reflect_dom_object_with_proto(Box::new(UIEvent::new_inherited()), window, proto) } pub fn new( diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index 74056c9f02e..fe3631e93fb 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::URLBinding::URLMethods; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::blob::Blob; @@ -44,7 +44,7 @@ impl URL { } fn new(global: &GlobalScope, proto: Option<HandleObject>, url: ServoUrl) -> DomRoot<URL> { - reflect_dom_object2(Box::new(URL::new_inherited(url)), global, proto) + reflect_dom_object_with_proto(Box::new(URL::new_inherited(url)), global, proto) } pub fn query_pairs(&self) -> Vec<(String, String)> { diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index e996f335518..f23991ab098 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::URLSearchParamsBinding::URLSearchPa use crate::dom::bindings::codegen::UnionTypes::USVStringSequenceSequenceOrUSVStringUSVStringRecordOrUSVString; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::iterable::Iterable; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{DOMString, USVString}; use crate::dom::bindings::weakref::MutableWeakRef; @@ -45,7 +45,7 @@ impl URLSearchParams { proto: Option<HandleObject>, url: Option<&URL>, ) -> DomRoot<URLSearchParams> { - reflect_dom_object2(Box::new(URLSearchParams::new_inherited(url)), global, proto) + reflect_dom_object_with_proto(Box::new(URLSearchParams::new_inherited(url)), global, proto) } // https://url.spec.whatwg.org/#dom-urlsearchparams-urlsearchparams diff --git a/components/script/dom/vttcue.rs b/components/script/dom/vttcue.rs index 695ddce5262..fa84fae363b 100644 --- a/components/script/dom/vttcue.rs +++ b/components/script/dom/vttcue.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::VTTCueBinding::{ }; use crate::dom::bindings::error::{Error, ErrorResult}; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::documentfragment::DocumentFragment; @@ -65,7 +65,7 @@ impl VTTCue { end_time: f64, text: DOMString, ) -> DomRoot<Self> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(Self::new_inherited(start_time, end_time, text)), global, proto, diff --git a/components/script/dom/vttregion.rs b/components/script/dom/vttregion.rs index f061416d3de..24069ded2cd 100644 --- a/components/script/dom/vttregion.rs +++ b/components/script/dom/vttregion.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::VTTRegionBinding::{ScrollSetting, VTTRegionMethods}; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::globalscope::GlobalScope; @@ -44,7 +44,7 @@ impl VTTRegion { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<Self> { - reflect_dom_object2(Box::new(Self::new_inherited()), global, proto) + reflect_dom_object_with_proto(Box::new(Self::new_inherited()), global, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/webglcontextevent.rs b/components/script/dom/webglcontextevent.rs index 3d4c43e357e..cd3924c4da5 100644 --- a/components/script/dom/webglcontextevent.rs +++ b/components/script/dom/webglcontextevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::WebGLContextEventBinding::WebGLCont use crate::dom::bindings::codegen::Bindings::WebGLContextEventBinding::WebGLContextEventMethods; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -60,7 +60,7 @@ impl WebGLContextEvent { cancelable: EventCancelable, status_message: DOMString, ) -> DomRoot<WebGLContextEvent> { - let event = reflect_dom_object2( + let event = reflect_dom_object_with_proto( Box::new(WebGLContextEvent::new_inherited(status_message)), window, proto, diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 4fcd35ff2be..5b5815f90c3 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -10,7 +10,7 @@ use crate::dom::bindings::conversions::ToJSValConvertible; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::{is_token, DOMString, USVString}; use crate::dom::blob::Blob; @@ -131,7 +131,7 @@ impl WebSocket { url: ServoUrl, sender: IpcSender<WebSocketDomAction>, ) -> DomRoot<WebSocket> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(WebSocket::new_inherited(url, sender)), global, proto, diff --git a/components/script/dom/wheelevent.rs b/components/script/dom/wheelevent.rs index 3e9a35243dc..33418a6f868 100644 --- a/components/script/dom/wheelevent.rs +++ b/components/script/dom/wheelevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::WheelEventBinding::WheelEventMethod use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::event::{Event, EventBubbles, EventCancelable}; @@ -39,7 +39,7 @@ impl WheelEvent { } fn new_unintialized(window: &Window, proto: Option<HandleObject>) -> DomRoot<WheelEvent> { - reflect_dom_object2(Box::new(WheelEvent::new_inherited()), window, proto) + reflect_dom_object_with_proto(Box::new(WheelEvent::new_inherited()), window, proto) } pub fn new( diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 1004429a16d..569f8188802 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -9,7 +9,7 @@ use crate::dom::bindings::codegen::Bindings::WorkerBinding::{WorkerMethods, Work use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::USVString; use crate::dom::bindings::structuredclone; @@ -69,7 +69,7 @@ impl Worker { sender: Sender<DedicatedWorkerScriptMsg>, closing: Arc<AtomicBool>, ) -> DomRoot<Worker> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(Worker::new_inherited(sender, closing)), global, proto, diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index 4aa9c9f4f91..4f901a13b3b 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -13,7 +13,7 @@ use crate::dom::bindings::conversions::ToJSValConvertible; use crate::dom::bindings::error::{Error, ErrorResult, Fallible}; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot, MutNullableDom}; use crate::dom::bindings::str::{is_token, ByteString, DOMString, USVString}; use crate::dom::blob::{normalize_type_string, Blob}; @@ -216,7 +216,7 @@ impl XMLHttpRequest { } fn new(global: &GlobalScope, proto: Option<HandleObject>) -> DomRoot<XMLHttpRequest> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(XMLHttpRequest::new_inherited(global)), global, proto, diff --git a/components/script/dom/xmlserializer.rs b/components/script/dom/xmlserializer.rs index b0d65424d33..55f0753d8f4 100644 --- a/components/script/dom/xmlserializer.rs +++ b/components/script/dom/xmlserializer.rs @@ -4,7 +4,7 @@ use crate::dom::bindings::codegen::Bindings::XMLSerializerBinding::XMLSerializerMethods; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::node::Node; @@ -28,7 +28,7 @@ impl XMLSerializer { } pub fn new(window: &Window, proto: Option<HandleObject>) -> DomRoot<XMLSerializer> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(XMLSerializer::new_inherited(window)), window, proto, diff --git a/components/script/dom/xrinputsourceevent.rs b/components/script/dom/xrinputsourceevent.rs index cdbc63b6454..836aa8f981e 100644 --- a/components/script/dom/xrinputsourceevent.rs +++ b/components/script/dom/xrinputsourceevent.rs @@ -8,7 +8,7 @@ use crate::dom::bindings::codegen::Bindings::XRInputSourceEventBinding::{ }; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -57,7 +57,7 @@ impl XRInputSourceEvent { frame: &XRFrame, source: &XRInputSource, ) -> DomRoot<XRInputSourceEvent> { - let trackevent = reflect_dom_object2( + let trackevent = reflect_dom_object_with_proto( Box::new(XRInputSourceEvent::new_inherited(frame, source)), global, proto, diff --git a/components/script/dom/xrinputsourceschangeevent.rs b/components/script/dom/xrinputsourceschangeevent.rs index 76f662e5eef..ae2fcdfa45f 100644 --- a/components/script/dom/xrinputsourceschangeevent.rs +++ b/components/script/dom/xrinputsourceschangeevent.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::XRInputSourcesChangeEventBinding::{ self, XRInputSourcesChangeEventMethods, }; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -70,7 +70,7 @@ impl XRInputSourcesChangeEvent { added: &[DomRoot<XRInputSource>], removed: &[DomRoot<XRInputSource>], ) -> DomRoot<XRInputSourcesChangeEvent> { - let changeevent = reflect_dom_object2( + let changeevent = reflect_dom_object_with_proto( Box::new(XRInputSourcesChangeEvent::new_inherited(session)), global, proto, diff --git a/components/script/dom/xrlayerevent.rs b/components/script/dom/xrlayerevent.rs index dc8cfe3662d..6671a4d1f10 100644 --- a/components/script/dom/xrlayerevent.rs +++ b/components/script/dom/xrlayerevent.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventBinding::EventMethods; use crate::dom::bindings::codegen::Bindings::XRLayerEventBinding::XRLayerEventInit; use crate::dom::bindings::codegen::Bindings::XRLayerEventBinding::XRLayerEventMethods; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::root::Dom; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; @@ -32,7 +32,7 @@ impl XRLayerEvent { } fn new(window: &Window, proto: Option<HandleObject>, layer: &XRLayer) -> DomRoot<XRLayerEvent> { - reflect_dom_object2(Box::new(XRLayerEvent::new_inherited(layer)), window, proto) + reflect_dom_object_with_proto(Box::new(XRLayerEvent::new_inherited(layer)), window, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/xrmediabinding.rs b/components/script/dom/xrmediabinding.rs index 30c7a0877aa..045d4812c1c 100644 --- a/components/script/dom/xrmediabinding.rs +++ b/components/script/dom/xrmediabinding.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::XRMediaBindingBinding::XRMediaBindi use crate::dom::bindings::codegen::Bindings::XRMediaBindingBinding::XRMediaLayerInit; use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::Reflector; use crate::dom::bindings::root::Dom; use crate::dom::bindings::root::DomRoot; @@ -38,7 +38,7 @@ impl XRMediaBinding { proto: Option<HandleObject>, session: &XRSession, ) -> DomRoot<XRMediaBinding> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(XRMediaBinding::new_inherited(session)), global, proto, diff --git a/components/script/dom/xrray.rs b/components/script/dom/xrray.rs index aca7f5b323d..f39813a4ddc 100644 --- a/components/script/dom/xrray.rs +++ b/components/script/dom/xrray.rs @@ -5,7 +5,7 @@ use crate::dom::bindings::codegen::Bindings::DOMPointBinding::DOMPointInit; use crate::dom::bindings::codegen::Bindings::XRRayBinding::{XRRayDirectionInit, XRRayMethods}; use crate::dom::bindings::error::{Error, Fallible}; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject, Reflector}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::utils::create_typed_array; use crate::dom::dompointreadonly::DOMPointReadOnly; @@ -43,7 +43,7 @@ impl XRRay { proto: Option<HandleObject>, ray: Ray<ApiSpace>, ) -> DomRoot<XRRay> { - reflect_dom_object2(Box::new(XRRay::new_inherited(ray)), global, proto) + reflect_dom_object_with_proto(Box::new(XRRay::new_inherited(ray)), global, proto) } #[allow(non_snake_case)] diff --git a/components/script/dom/xrrigidtransform.rs b/components/script/dom/xrrigidtransform.rs index d2c7696f4c3..74f5e348137 100644 --- a/components/script/dom/xrrigidtransform.rs +++ b/components/script/dom/xrrigidtransform.rs @@ -7,7 +7,7 @@ use crate::dom::bindings::codegen::Bindings::XRRigidTransformBinding::XRRigidTra use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::reflector::DomObject; -use crate::dom::bindings::reflector::{reflect_dom_object2, Reflector}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::utils::create_typed_array; use crate::dom::dompointreadonly::DOMPointReadOnly; @@ -54,7 +54,7 @@ impl XRRigidTransform { proto: Option<HandleObject>, transform: ApiRigidTransform, ) -> DomRoot<XRRigidTransform> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(XRRigidTransform::new_inherited(transform)), global, proto, diff --git a/components/script/dom/xrsessionevent.rs b/components/script/dom/xrsessionevent.rs index 15a2685bda1..68eb1903c82 100644 --- a/components/script/dom/xrsessionevent.rs +++ b/components/script/dom/xrsessionevent.rs @@ -6,7 +6,7 @@ use crate::dom::bindings::codegen::Bindings::EventBinding::EventBinding::EventMe use crate::dom::bindings::codegen::Bindings::XRSessionEventBinding::{self, XRSessionEventMethods}; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::DOMString; use crate::dom::event::Event; @@ -50,7 +50,7 @@ impl XRSessionEvent { cancelable: bool, session: &XRSession, ) -> DomRoot<XRSessionEvent> { - let trackevent = reflect_dom_object2( + let trackevent = reflect_dom_object_with_proto( Box::new(XRSessionEvent::new_inherited(&session)), global, proto, diff --git a/components/script/dom/xrwebglbinding.rs b/components/script/dom/xrwebglbinding.rs index fb64c92d7e6..60e2d1be6b4 100644 --- a/components/script/dom/xrwebglbinding.rs +++ b/components/script/dom/xrwebglbinding.rs @@ -13,7 +13,7 @@ use crate::dom::bindings::codegen::Bindings::XRWebGLBindingBinding::XRWebGLBindi use crate::dom::bindings::codegen::UnionTypes::WebGLRenderingContextOrWebGL2RenderingContext; use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Fallible; -use crate::dom::bindings::reflector::reflect_dom_object2; +use crate::dom::bindings::reflector::reflect_dom_object_with_proto; use crate::dom::bindings::reflector::Reflector; use crate::dom::bindings::root::Dom; use crate::dom::bindings::root::DomRoot; @@ -54,7 +54,7 @@ impl XRWebGLBinding { session: &XRSession, context: &WebGLRenderingContext, ) -> DomRoot<XRWebGLBinding> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(XRWebGLBinding::new_inherited(session, context)), global, proto, diff --git a/components/script/dom/xrwebgllayer.rs b/components/script/dom/xrwebgllayer.rs index bbf6e76e5db..1e414d95779 100644 --- a/components/script/dom/xrwebgllayer.rs +++ b/components/script/dom/xrwebgllayer.rs @@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::XRWebGLLayerBinding::XRWebGLRenderi use crate::dom::bindings::error::Error; use crate::dom::bindings::error::Fallible; use crate::dom::bindings::inheritance::Castable; -use crate::dom::bindings::reflector::{reflect_dom_object2, DomObject}; +use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, DomObject}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::globalscope::GlobalScope; use crate::dom::webglframebuffer::WebGLFramebuffer; @@ -88,7 +88,7 @@ impl XRWebGLLayer { framebuffer: Option<&WebGLFramebuffer>, layer_id: Option<LayerId>, ) -> DomRoot<XRWebGLLayer> { - reflect_dom_object2( + reflect_dom_object_with_proto( Box::new(XRWebGLLayer::new_inherited( session, context, |