diff options
Diffstat (limited to 'components/script')
383 files changed, 550 insertions, 385 deletions
diff --git a/components/script/dom/abstractrange.rs b/components/script/dom/abstractrange.rs index f4f86566f41..bced93d478b 100644 --- a/components/script/dom/abstractrange.rs +++ b/components/script/dom/abstractrange.rs @@ -64,7 +64,7 @@ impl AbstractRange { } } -impl AbstractRangeMethods for AbstractRange { +impl AbstractRangeMethods<crate::DomTypeHolder> for AbstractRange { /// <https://dom.spec.whatwg.org/#dom-range-startcontainer> fn StartContainer(&self) -> DomRoot<Node> { self.start.node.get() diff --git a/components/script/dom/analysernode.rs b/components/script/dom/analysernode.rs index 486747ec8fb..47d8f255088 100644 --- a/components/script/dom/analysernode.rs +++ b/components/script/dom/analysernode.rs @@ -137,7 +137,7 @@ impl AnalyserNode { } } -impl AnalyserNodeMethods for AnalyserNode { +impl AnalyserNodeMethods<crate::DomTypeHolder> for AnalyserNode { /// <https://webaudio.github.io/web-audio-api/#dom-analysernode-analysernode> fn Constructor( window: &Window, diff --git a/components/script/dom/animationevent.rs b/components/script/dom/animationevent.rs index c3a8655c496..673db954bb0 100644 --- a/components/script/dom/animationevent.rs +++ b/components/script/dom/animationevent.rs @@ -68,7 +68,7 @@ impl AnimationEvent { } } -impl AnimationEventMethods for AnimationEvent { +impl AnimationEventMethods<crate::DomTypeHolder> for AnimationEvent { // https://drafts.csswg.org/css-animations/#dom-animationevent-animationevent fn Constructor( window: &Window, diff --git a/components/script/dom/attr.rs b/components/script/dom/attr.rs index 140329ec4cc..701175b0fac 100644 --- a/components/script/dom/attr.rs +++ b/components/script/dom/attr.rs @@ -97,7 +97,7 @@ impl Attr { } } -impl AttrMethods for Attr { +impl AttrMethods<crate::DomTypeHolder> for Attr { // https://dom.spec.whatwg.org/#dom-attr-localname fn LocalName(&self) -> DOMString { // FIXME(ajeffrey): convert directly from LocalName to DOMString diff --git a/components/script/dom/audiobuffer.rs b/components/script/dom/audiobuffer.rs index c28160c63a9..8b88cd0bcac 100644 --- a/components/script/dom/audiobuffer.rs +++ b/components/script/dom/audiobuffer.rs @@ -183,7 +183,7 @@ impl AudioBuffer { } } -impl AudioBufferMethods for AudioBuffer { +impl AudioBufferMethods<crate::DomTypeHolder> for AudioBuffer { // https://webaudio.github.io/web-audio-api/#dom-audiobuffer-audiobuffer fn Constructor( window: &Window, diff --git a/components/script/dom/audiobuffersourcenode.rs b/components/script/dom/audiobuffersourcenode.rs index a261aea9d1f..3f559457b7c 100644 --- a/components/script/dom/audiobuffersourcenode.rs +++ b/components/script/dom/audiobuffersourcenode.rs @@ -123,7 +123,7 @@ impl AudioBufferSourceNode { } } -impl AudioBufferSourceNodeMethods for AudioBufferSourceNode { +impl AudioBufferSourceNodeMethods<crate::DomTypeHolder> for AudioBufferSourceNode { // https://webaudio.github.io/web-audio-api/#dom-audiobuffersourcenode-audiobuffersourcenode fn Constructor( window: &Window, diff --git a/components/script/dom/audiocontext.rs b/components/script/dom/audiocontext.rs index c67d25ff014..bf83796674e 100644 --- a/components/script/dom/audiocontext.rs +++ b/components/script/dom/audiocontext.rs @@ -109,7 +109,7 @@ impl AudioContext { } } -impl AudioContextMethods for AudioContext { +impl AudioContextMethods<crate::DomTypeHolder> for AudioContext { // https://webaudio.github.io/web-audio-api/#AudioContext-constructors fn Constructor( window: &Window, diff --git a/components/script/dom/audiodestinationnode.rs b/components/script/dom/audiodestinationnode.rs index a63daaf4587..f0071a2f111 100644 --- a/components/script/dom/audiodestinationnode.rs +++ b/components/script/dom/audiodestinationnode.rs @@ -48,7 +48,7 @@ impl AudioDestinationNode { } } -impl AudioDestinationNodeMethods for AudioDestinationNode { +impl AudioDestinationNodeMethods<crate::DomTypeHolder> for AudioDestinationNode { // https://webaudio.github.io/web-audio-api/#dom-audiodestinationnode-maxchannelcount fn MaxChannelCount(&self) -> u32 { MAX_CHANNEL_COUNT diff --git a/components/script/dom/audiolistener.rs b/components/script/dom/audiolistener.rs index ad8bdb071ba..7f005ba77f1 100644 --- a/components/script/dom/audiolistener.rs +++ b/components/script/dom/audiolistener.rs @@ -160,7 +160,7 @@ impl AudioListener { } #[allow(non_snake_case)] -impl AudioListenerMethods for AudioListener { +impl AudioListenerMethods<crate::DomTypeHolder> for AudioListener { // https://webaudio.github.io/web-audio-api/#dom-audiolistener-positionx fn PositionX(&self) -> DomRoot<AudioParam> { DomRoot::from_ref(&self.position_x) diff --git a/components/script/dom/audionode.rs b/components/script/dom/audionode.rs index 728f2f401bb..91431ca2928 100644 --- a/components/script/dom/audionode.rs +++ b/components/script/dom/audionode.rs @@ -106,7 +106,7 @@ impl AudioNode { } } -impl AudioNodeMethods for AudioNode { +impl AudioNodeMethods<crate::DomTypeHolder> for AudioNode { // https://webaudio.github.io/web-audio-api/#dom-audionode-connect fn Connect( &self, diff --git a/components/script/dom/audioparam.rs b/components/script/dom/audioparam.rs index f54a4785073..5ba3ef1e951 100644 --- a/components/script/dom/audioparam.rs +++ b/components/script/dom/audioparam.rs @@ -110,7 +110,7 @@ impl AudioParam { } } -impl AudioParamMethods for AudioParam { +impl AudioParamMethods<crate::DomTypeHolder> for AudioParam { // https://webaudio.github.io/web-audio-api/#dom-audioparam-automationrate fn AutomationRate(&self) -> AutomationRate { self.automation_rate.get() diff --git a/components/script/dom/audioscheduledsourcenode.rs b/components/script/dom/audioscheduledsourcenode.rs index e5f50c6b841..c8a970f390e 100644 --- a/components/script/dom/audioscheduledsourcenode.rs +++ b/components/script/dom/audioscheduledsourcenode.rs @@ -57,7 +57,7 @@ impl AudioScheduledSourceNode { } } -impl AudioScheduledSourceNodeMethods for AudioScheduledSourceNode { +impl AudioScheduledSourceNodeMethods<crate::DomTypeHolder> for AudioScheduledSourceNode { // https://webaudio.github.io/web-audio-api/#dom-audioscheduledsourcenode-onended event_handler!(ended, GetOnended, SetOnended); diff --git a/components/script/dom/audiotrack.rs b/components/script/dom/audiotrack.rs index 516e8c6ae93..34666ae7d44 100644 --- a/components/script/dom/audiotrack.rs +++ b/components/script/dom/audiotrack.rs @@ -85,7 +85,7 @@ impl AudioTrack { } } -impl AudioTrackMethods for AudioTrack { +impl AudioTrackMethods<crate::DomTypeHolder> for AudioTrack { // https://html.spec.whatwg.org/multipage/#dom-audiotrack-id fn Id(&self) -> DOMString { self.id() diff --git a/components/script/dom/audiotracklist.rs b/components/script/dom/audiotracklist.rs index b9f62c4b72e..a285c508eb4 100644 --- a/components/script/dom/audiotracklist.rs +++ b/components/script/dom/audiotracklist.rs @@ -117,7 +117,7 @@ impl AudioTrackList { } } -impl AudioTrackListMethods for AudioTrackList { +impl AudioTrackListMethods<crate::DomTypeHolder> for AudioTrackList { // https://html.spec.whatwg.org/multipage/#dom-audiotracklist-length fn Length(&self) -> u32 { self.len() as u32 diff --git a/components/script/dom/baseaudiocontext.rs b/components/script/dom/baseaudiocontext.rs index 1907878b4c9..73ee5f39eb7 100644 --- a/components/script/dom/baseaudiocontext.rs +++ b/components/script/dom/baseaudiocontext.rs @@ -276,7 +276,7 @@ impl BaseAudioContext { } } -impl BaseAudioContextMethods for BaseAudioContext { +impl BaseAudioContextMethods<crate::DomTypeHolder> for BaseAudioContext { /// <https://webaudio.github.io/web-audio-api/#dom-baseaudiocontext-samplerate> fn SampleRate(&self) -> Finite<f32> { Finite::wrap(self.sample_rate) diff --git a/components/script/dom/beforeunloadevent.rs b/components/script/dom/beforeunloadevent.rs index 6a30336afe8..5df2bbc6452 100644 --- a/components/script/dom/beforeunloadevent.rs +++ b/components/script/dom/beforeunloadevent.rs @@ -51,7 +51,7 @@ impl BeforeUnloadEvent { } } -impl BeforeUnloadEventMethods for BeforeUnloadEvent { +impl BeforeUnloadEventMethods<crate::DomTypeHolder> for BeforeUnloadEvent { // https://html.spec.whatwg.org/multipage/#dom-beforeunloadevent-returnvalue fn ReturnValue(&self) -> DOMString { self.return_value.borrow().clone() diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index f716f4a8be1..6ac9ae1d5d9 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -540,6 +540,12 @@ def union_native_type(t): return f'UnionTypes::{name}' +# Unfortunately, .capitalize() on a string will lowercase things inside the +# string, which we do not want. +def firstCap(string): + return f"{string[0].upper()}{string[1:]}" + + class JSToNativeConversionInfo(): """ An object representing information about a JS-to-native conversion. @@ -643,11 +649,6 @@ def getJSToNativeConversionInfo(type, descriptorProvider, failureCode=None, assert (defaultValue is None) == (default is None) return JSToNativeConversionInfo(template, default, declType) - # Unfortunately, .capitalize() on a string will lowercase things inside the - # string, which we do not want. - def firstCap(string): - return f"{string[0].upper()}{string[1:]}" - # Helper functions for dealing with failures due to the JS value being the # wrong type of value. def onFailureNotAnObject(failureCode): @@ -2621,6 +2622,7 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config): imports = [ 'crate::dom', 'crate::dom::bindings::import::base::*', + 'crate::dom::bindings::codegen::DomTypes::DomTypes', 'crate::dom::bindings::conversions::windowproxy_from_handlevalue', 'crate::dom::bindings::record::Record', 'crate::dom::types::*', @@ -2658,6 +2660,108 @@ def UnionTypes(descriptors, dictionaries, callbacks, typedefs, config): typedefs=[], imports=imports, config=config) +def DomTypes(descriptors, descriptorProvider, dictionaries, callbacks, typedefs, config): + traits = [ + "js::rust::Trace", + "malloc_size_of::MallocSizeOf", + "Sized", + ] + joinedTraits = ' + '.join(traits) + elements = [CGGeneric(f"pub trait DomTypes: {joinedTraits} where Self: 'static {{\n")] + for descriptor in descriptors: + iface_name = descriptor.interface.identifier.name + traits = [] + + chain = descriptor.prototypeChain + upcast = descriptor.hasDescendants() + + if not upcast: + # No other interface will implement DeriveFrom<Foo> for this Foo, so avoid + # implementing it for itself. + chain = chain[:-1] + + if chain: + traits += ["crate::dom::bindings::inheritance::Castable"] + + for parent in chain: + traits += [f"crate::dom::bindings::conversions::DerivedFrom<Self::{parent}>"] + + iterableDecl = descriptor.interface.maplikeOrSetlikeOrIterable + if iterableDecl: + if iterableDecl.isMaplike(): + keytype = getRetvalDeclarationForType(iterableDecl.keyType, None).define() + valuetype = getRetvalDeclarationForType(iterableDecl.valueType, None).define() + traits += [f"crate::dom::bindings::like::Maplike<Key={keytype}, Value={valuetype}>"] + if iterableDecl.isSetlike(): + keytype = getRetvalDeclarationForType(iterableDecl.keyType, None).define() + traits += [f"crate::dom::bindings::like::Setlike<Key={keytype}>"] + if iterableDecl.hasKeyType(): + traits += [ + "crate::dom::bindings::reflector::DomObjectIteratorWrap", + ] + + if descriptor.weakReferenceable: + traits += ["crate::dom::bindings::weakref::WeakReferenceable"] + + if not descriptor.interface.isNamespace(): + traits += [ + "js::conversions::ToJSValConvertible", + "crate::dom::bindings::reflector::MutDomObject", + "crate::dom::bindings::reflector::DomObject", + ] + + if descriptor.register: + if ( + (descriptor.concrete or descriptor.hasDescendants()) + and not descriptor.interface.isNamespace() + and not descriptor.interface.isIteratorInterface() + ): + traits += [ + "crate::dom::bindings::conversions::IDLInterface", + "PartialEq", + ] + + if descriptor.concrete and not descriptor.isGlobal(): + traits += ["crate::dom::bindings::reflector::DomObjectWrap"] + + if not descriptor.interface.isCallback() and not descriptor.interface.isIteratorInterface(): + nonConstMembers = [m for m in descriptor.interface.members if not m.isConst()] + ctor = descriptor.interface.ctor() + if ( + nonConstMembers + or (ctor and not ctor.isHTMLConstructor()) + or descriptor.interface.legacyFactoryFunctions + ): + namespace = f"{toBindingPath(descriptor)}" + traits += [f"crate::dom::bindings::codegen::Bindings::{namespace}::{iface_name}Methods<Self>"] + isPromise = firstCap(iface_name) == "Promise" + elements += [ + CGGeneric(" #[crown::unrooted_must_root_lint::must_root]\n"), + CGGeneric(" #[crown::unrooted_must_root_lint::allow_unrooted_in_rc]\n" if isPromise else ""), + CGGeneric(f" type {firstCap(iface_name)}: {' + '.join(traits)};\n") + ] + elements += [CGGeneric("}\n")] + return CGList([CGGeneric("use crate::dom::bindings::str::DOMString;\n")] + elements) + + +def DomTypeHolder(descriptors, descriptorProvider, dictionaries, callbacks, typedefs, config): + elements = [ + CGGeneric( + "#[derive(JSTraceable, MallocSizeOf, PartialEq)]\n" + "pub struct DomTypeHolder;\n" + "impl crate::DomTypes for DomTypeHolder {\n" + ), + ] + for descriptor in descriptors: + if descriptor.interface.isCallback() or descriptor.interface.isIteratorInterface(): + continue + iface_name = descriptor.interface.identifier.name + path = f"crate::dom::{iface_name.lower()}::{firstCap(iface_name)}" + elements.append(CGGeneric(f" type {firstCap(iface_name)} = {path};\n")) + elements.append(CGGeneric("}\n")) + return CGList(elements) + + class Argument(): """ A class for outputting the type and name of an argument @@ -3061,6 +3165,12 @@ DomRoot::from_ref(&*root)\ """) +def toBindingPath(descriptor): + module = toBindingModuleFileFromDescriptor(descriptor) + namespace = toBindingNamespace(descriptor.interface.identifier.name) + return f"{module}::{namespace}" + + class CGIDLInterface(CGThing): """ Class for codegen of an implementation of the IDLInterface trait. @@ -6495,7 +6605,7 @@ class CGInterfaceTrait(CGThing): if methods: self.cgRoot = CGWrapper(CGIndenter(CGList(methods, "")), - pre=f"pub trait {descriptor.interface.identifier.name}Methods {{\n", + pre=f"pub trait {descriptor.interface.identifier.name}Methods<D: DomTypes> {{\n", post="}") else: self.cgRoot = CGGeneric("") @@ -8151,6 +8261,36 @@ impl {base} {{ return curr @staticmethod + def DomTypes(config): + curr = DomTypes(config.getDescriptors(), + config.getDescriptorProvider(), + config.getDictionaries(), + config.getCallbacks(), + config.typedefs, + config) + + # Add the auto-generated comment. + curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT) + + # Done. + return curr + + @staticmethod + def DomTypeHolder(config): + curr = DomTypeHolder(config.getDescriptors(), + config.getDescriptorProvider(), + config.getDictionaries(), + config.getCallbacks(), + config.typedefs, + config) + + # Add the auto-generated comment. + curr = CGWrapper(curr, pre=AUTOGENERATED_WARNING_COMMENT) + + # Done. + return curr + + @staticmethod def SupportedDomApis(config): descriptors = config.getDescriptors(isExposedConditionally=False) diff --git a/components/script/dom/bindings/codegen/run.py b/components/script/dom/bindings/codegen/run.py index 4bf5966e305..52840b1b1d3 100644 --- a/components/script/dom/bindings/codegen/run.py +++ b/components/script/dom/bindings/codegen/run.py @@ -48,6 +48,8 @@ def main(): ("InheritTypes", "InheritTypes.rs"), ("Bindings", "Bindings/mod.rs"), ("UnionTypes", "UnionTypes.rs"), + ("DomTypes", "DomTypes.rs"), + ("DomTypeHolder", "DomTypeHolder.rs"), ]: generate(config, name, os.path.join(out_dir, filename)) make_dir(doc_servo) diff --git a/components/script/dom/bindings/import.rs b/components/script/dom/bindings/import.rs index 1f6f0cec972..c4c7a460ca9 100644 --- a/components/script/dom/bindings/import.rs +++ b/components/script/dom/bindings/import.rs @@ -25,6 +25,7 @@ pub mod base { ChannelCountMode, ChannelCountModeValues, ChannelInterpretation, ChannelInterpretationValues, }; + pub use crate::dom::bindings::codegen::DomTypes::DomTypes; pub use crate::dom::bindings::codegen::UnionTypes; pub use crate::dom::bindings::conversions::{ root_from_handlevalue, ConversionBehavior, ConversionResult, FromJSValConvertible, diff --git a/components/script/dom/bindings/mod.rs b/components/script/dom/bindings/mod.rs index d291f8e353f..a6666b70d90 100644 --- a/components/script/dom/bindings/mod.rs +++ b/components/script/dom/bindings/mod.rs @@ -170,6 +170,12 @@ pub mod xmlname; /// Generated JS-Rust bindings. #[allow(missing_docs, non_snake_case)] pub mod codegen { + pub mod DomTypeHolder { + include!(concat!(env!("OUT_DIR"), "/DomTypeHolder.rs")); + } + pub mod DomTypes { + include!(concat!(env!("OUT_DIR"), "/DomTypes.rs")); + } #[allow(dead_code)] pub mod Bindings { include!(concat!(env!("OUT_DIR"), "/Bindings/mod.rs")); diff --git a/components/script/dom/biquadfilternode.rs b/components/script/dom/biquadfilternode.rs index 92d39503690..be0d8fdecea 100644 --- a/components/script/dom/biquadfilternode.rs +++ b/components/script/dom/biquadfilternode.rs @@ -140,7 +140,7 @@ impl BiquadFilterNode { } } -impl BiquadFilterNodeMethods for BiquadFilterNode { +impl BiquadFilterNodeMethods<crate::DomTypeHolder> for BiquadFilterNode { // https://webaudio.github.io/web-audio-api/#dom-biquadfilternode-biquadfilternode-context-options fn Constructor( window: &Window, diff --git a/components/script/dom/blob.rs b/components/script/dom/blob.rs index 31c6fa64620..e92d64d1958 100644 --- a/components/script/dom/blob.rs +++ b/components/script/dom/blob.rs @@ -202,7 +202,7 @@ pub fn blob_parts_to_bytes( Ok(ret) } -impl BlobMethods for Blob { +impl BlobMethods<crate::DomTypeHolder> for Blob { // https://w3c.github.io/FileAPI/#constructorBlob #[allow(non_snake_case)] fn Constructor( diff --git a/components/script/dom/bluetooth.rs b/components/script/dom/bluetooth.rs index 2799bfae29c..4d9c58a44ff 100644 --- a/components/script/dom/bluetooth.rs +++ b/components/script/dom/bluetooth.rs @@ -534,7 +534,7 @@ impl From<BluetoothError> for Error { } } -impl BluetoothMethods for Bluetooth { +impl BluetoothMethods<crate::DomTypeHolder> for Bluetooth { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetooth-requestdevice fn RequestDevice( &self, diff --git a/components/script/dom/bluetoothadvertisingevent.rs b/components/script/dom/bluetoothadvertisingevent.rs index 6d1909c17ef..0fc7a4dbe8b 100644 --- a/components/script/dom/bluetoothadvertisingevent.rs +++ b/components/script/dom/bluetoothadvertisingevent.rs @@ -81,7 +81,7 @@ impl BluetoothAdvertisingEvent { } } -impl BluetoothAdvertisingEventMethods for BluetoothAdvertisingEvent { +impl BluetoothAdvertisingEventMethods<crate::DomTypeHolder> for BluetoothAdvertisingEvent { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothadvertisingevent-bluetoothadvertisingevent #[allow(non_snake_case)] fn Constructor( diff --git a/components/script/dom/bluetoothcharacteristicproperties.rs b/components/script/dom/bluetoothcharacteristicproperties.rs index be322eec17a..addfd0c8719 100644 --- a/components/script/dom/bluetoothcharacteristicproperties.rs +++ b/components/script/dom/bluetoothcharacteristicproperties.rs @@ -82,7 +82,9 @@ impl BluetoothCharacteristicProperties { } } -impl BluetoothCharacteristicPropertiesMethods for BluetoothCharacteristicProperties { +impl BluetoothCharacteristicPropertiesMethods<crate::DomTypeHolder> + for BluetoothCharacteristicProperties +{ // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothcharacteristicproperties-broadcast fn Broadcast(&self) -> bool { self.broadcast diff --git a/components/script/dom/bluetoothdevice.rs b/components/script/dom/bluetoothdevice.rs index 8fd8e316f3b..97d438210e8 100644 --- a/components/script/dom/bluetoothdevice.rs +++ b/components/script/dom/bluetoothdevice.rs @@ -253,7 +253,7 @@ impl BluetoothDevice { } } -impl BluetoothDeviceMethods for BluetoothDevice { +impl BluetoothDeviceMethods<crate::DomTypeHolder> for BluetoothDevice { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothdevice-id fn Id(&self) -> DOMString { self.id.clone() diff --git a/components/script/dom/bluetoothpermissionresult.rs b/components/script/dom/bluetoothpermissionresult.rs index 37dfe234da1..2b540d977b5 100644 --- a/components/script/dom/bluetoothpermissionresult.rs +++ b/components/script/dom/bluetoothpermissionresult.rs @@ -81,7 +81,7 @@ impl BluetoothPermissionResult { } } -impl BluetoothPermissionResultMethods for BluetoothPermissionResult { +impl BluetoothPermissionResultMethods<crate::DomTypeHolder> for BluetoothPermissionResult { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothpermissionresult-devices fn Devices(&self) -> Vec<DomRoot<BluetoothDevice>> { let device_vec: Vec<DomRoot<BluetoothDevice>> = self diff --git a/components/script/dom/bluetoothremotegattcharacteristic.rs b/components/script/dom/bluetoothremotegattcharacteristic.rs index ccf4623e621..207b4e438f3 100644 --- a/components/script/dom/bluetoothremotegattcharacteristic.rs +++ b/components/script/dom/bluetoothremotegattcharacteristic.rs @@ -91,7 +91,9 @@ impl BluetoothRemoteGATTCharacteristic { } } -impl BluetoothRemoteGATTCharacteristicMethods for BluetoothRemoteGATTCharacteristic { +impl BluetoothRemoteGATTCharacteristicMethods<crate::DomTypeHolder> + for BluetoothRemoteGATTCharacteristic +{ // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattcharacteristic-properties fn Properties(&self) -> DomRoot<BluetoothCharacteristicProperties> { DomRoot::from_ref(&self.properties) diff --git a/components/script/dom/bluetoothremotegattdescriptor.rs b/components/script/dom/bluetoothremotegattdescriptor.rs index 0cbac631666..9492ecd7363 100644 --- a/components/script/dom/bluetoothremotegattdescriptor.rs +++ b/components/script/dom/bluetoothremotegattdescriptor.rs @@ -78,7 +78,7 @@ impl BluetoothRemoteGATTDescriptor { } } -impl BluetoothRemoteGATTDescriptorMethods for BluetoothRemoteGATTDescriptor { +impl BluetoothRemoteGATTDescriptorMethods<crate::DomTypeHolder> for BluetoothRemoteGATTDescriptor { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattdescriptor-characteristic fn Characteristic(&self) -> DomRoot<BluetoothRemoteGATTCharacteristic> { DomRoot::from_ref(&self.characteristic) diff --git a/components/script/dom/bluetoothremotegattserver.rs b/components/script/dom/bluetoothremotegattserver.rs index 07f0a2d5751..b386693d172 100644 --- a/components/script/dom/bluetoothremotegattserver.rs +++ b/components/script/dom/bluetoothremotegattserver.rs @@ -58,7 +58,7 @@ impl BluetoothRemoteGATTServer { } } -impl BluetoothRemoteGATTServerMethods for BluetoothRemoteGATTServer { +impl BluetoothRemoteGATTServerMethods<crate::DomTypeHolder> for BluetoothRemoteGATTServer { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattserver-device fn Device(&self) -> DomRoot<BluetoothDevice> { DomRoot::from_ref(&self.device) diff --git a/components/script/dom/bluetoothremotegattservice.rs b/components/script/dom/bluetoothremotegattservice.rs index 5d696555f68..7d951fea222 100644 --- a/components/script/dom/bluetoothremotegattservice.rs +++ b/components/script/dom/bluetoothremotegattservice.rs @@ -68,7 +68,7 @@ impl BluetoothRemoteGATTService { } } -impl BluetoothRemoteGATTServiceMethods for BluetoothRemoteGATTService { +impl BluetoothRemoteGATTServiceMethods<crate::DomTypeHolder> for BluetoothRemoteGATTService { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothremotegattservice-device fn Device(&self) -> DomRoot<BluetoothDevice> { DomRoot::from_ref(&self.device) diff --git a/components/script/dom/bluetoothuuid.rs b/components/script/dom/bluetoothuuid.rs index 529c817f331..9c2d053f8d7 100644 --- a/components/script/dom/bluetoothuuid.rs +++ b/components/script/dom/bluetoothuuid.rs @@ -584,7 +584,7 @@ const CHARACTERISTIC_ERROR_MESSAGE: &str = const DESCRIPTOR_ERROR_MESSAGE: &str = "https://developer.bluetooth.org/gatt/descriptors/Pages/\ DescriptorsHomePage.aspx\ne.g. 'gatt.characteristic_presentation_format'."; -impl BluetoothUUIDMethods for BluetoothUUID { +impl BluetoothUUIDMethods<crate::DomTypeHolder> for BluetoothUUID { // https://webbluetoothcg.github.io/web-bluetooth/#dom-bluetoothuuid-canonicaluuid fn CanonicalUUID(_: &Window, alias: u32) -> UUID { canonical_uuid(alias) diff --git a/components/script/dom/broadcastchannel.rs b/components/script/dom/broadcastchannel.rs index 7302aded9c7..dd0699ff895 100644 --- a/components/script/dom/broadcastchannel.rs +++ b/components/script/dom/broadcastchannel.rs @@ -66,7 +66,7 @@ impl BroadcastChannel { } } -impl BroadcastChannelMethods for BroadcastChannel { +impl BroadcastChannelMethods<crate::DomTypeHolder> for BroadcastChannel { /// <https://html.spec.whatwg.org/multipage/#broadcastchannel> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/canvasgradient.rs b/components/script/dom/canvasgradient.rs index f1317dd0a90..93328b545ee 100644 --- a/components/script/dom/canvasgradient.rs +++ b/components/script/dom/canvasgradient.rs @@ -47,7 +47,7 @@ impl CanvasGradient { } } -impl CanvasGradientMethods for CanvasGradient { +impl CanvasGradientMethods<crate::DomTypeHolder> for CanvasGradient { // https://html.spec.whatwg.org/multipage/#dom-canvasgradient-addcolorstop fn AddColorStop(&self, offset: Finite<f64>, color: DOMString, can_gc: CanGc) -> ErrorResult { if *offset < 0f64 || *offset > 1f64 { diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index bc131b94eab..592359d486a 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -154,7 +154,7 @@ impl LayoutCanvasRenderingContext2DHelpers for LayoutDom<'_, CanvasRenderingCont // Restricted values are guarded in glue code. Therefore we need not add a guard. // // FIXME: this behavior should might be generated by some annotattions to idl. -impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { +impl CanvasRenderingContext2DMethods<crate::DomTypeHolder> for CanvasRenderingContext2D { // https://html.spec.whatwg.org/multipage/#dom-context-2d-canvas fn Canvas(&self) -> DomRoot<HTMLCanvasElement> { // This method is not called from a paint worklet rendering context, diff --git a/components/script/dom/channelmergernode.rs b/components/script/dom/channelmergernode.rs index 47d1e1600f3..db9cb5c7e55 100644 --- a/components/script/dom/channelmergernode.rs +++ b/components/script/dom/channelmergernode.rs @@ -84,7 +84,7 @@ impl ChannelMergerNode { } } -impl ChannelMergerNodeMethods for ChannelMergerNode { +impl ChannelMergerNodeMethods<crate::DomTypeHolder> for ChannelMergerNode { /// <https://webaudio.github.io/web-audio-api/#dom-channelmergernode-channelmergernode> fn Constructor( window: &Window, diff --git a/components/script/dom/channelsplitternode.rs b/components/script/dom/channelsplitternode.rs index 29d7a92f94f..a058a898c85 100644 --- a/components/script/dom/channelsplitternode.rs +++ b/components/script/dom/channelsplitternode.rs @@ -86,7 +86,7 @@ impl ChannelSplitterNode { } } -impl ChannelSplitterNodeMethods for ChannelSplitterNode { +impl ChannelSplitterNodeMethods<crate::DomTypeHolder> for ChannelSplitterNode { /// <https://webaudio.github.io/web-audio-api/#dom-channelsplitternode-channelsplitternode> fn Constructor( window: &Window, diff --git a/components/script/dom/characterdata.rs b/components/script/dom/characterdata.rs index 4c53a09ca60..cc523e13964 100644 --- a/components/script/dom/characterdata.rs +++ b/components/script/dom/characterdata.rs @@ -107,7 +107,7 @@ impl CharacterData { } } -impl CharacterDataMethods for CharacterData { +impl CharacterDataMethods<crate::DomTypeHolder> for CharacterData { // https://dom.spec.whatwg.org/#dom-characterdata-data fn Data(&self) -> DOMString { self.data.borrow().clone() diff --git a/components/script/dom/client.rs b/components/script/dom/client.rs index 610f4671bbd..5c87ec2acd2 100644 --- a/components/script/dom/client.rs +++ b/components/script/dom/client.rs @@ -56,7 +56,7 @@ impl Client { } } -impl ClientMethods for Client { +impl ClientMethods<crate::DomTypeHolder> for Client { // https://w3c.github.io/ServiceWorker/#client-url-attribute fn Url(&self) -> USVString { USVString(self.url.as_str().to_owned()) diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs index 6fc7fdcb2c6..3b7faf97356 100644 --- a/components/script/dom/closeevent.rs +++ b/components/script/dom/closeevent.rs @@ -75,7 +75,7 @@ impl CloseEvent { } } -impl CloseEventMethods for CloseEvent { +impl CloseEventMethods<crate::DomTypeHolder> for CloseEvent { // https://websockets.spec.whatwg.org/#the-closeevent-interface fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/comment.rs b/components/script/dom/comment.rs index 8a6b41c44f6..a5b9fd4c43a 100644 --- a/components/script/dom/comment.rs +++ b/components/script/dom/comment.rs @@ -44,7 +44,7 @@ impl Comment { } } -impl CommentMethods for Comment { +impl CommentMethods<crate::DomTypeHolder> for Comment { /// <https://dom.spec.whatwg.org/#dom-comment-comment> fn Constructor( window: &Window, diff --git a/components/script/dom/compositionevent.rs b/components/script/dom/compositionevent.rs index 6d602acead7..d48c6f79b53 100644 --- a/components/script/dom/compositionevent.rs +++ b/components/script/dom/compositionevent.rs @@ -82,7 +82,7 @@ impl CompositionEvent { } } -impl CompositionEventMethods for CompositionEvent { +impl CompositionEventMethods<crate::DomTypeHolder> for CompositionEvent { // https://w3c.github.io/uievents/#dom-compositionevent-compositionevent fn Constructor( window: &Window, diff --git a/components/script/dom/console.rs b/components/script/dom/console.rs index 2c9d01236e7..7effcababd6 100644 --- a/components/script/dom/console.rs +++ b/components/script/dom/console.rs @@ -227,7 +227,7 @@ fn console_message(global: &GlobalScope, message: DOMString, level: LogLevel) { }) } -impl consoleMethods for Console { +impl consoleMethods<crate::DomTypeHolder> for Console { // https://developer.mozilla.org/en-US/docs/Web/API/Console/log fn Log(_cx: JSContext, global: &GlobalScope, messages: Vec<HandleValue>) { console_messages(global, messages, LogLevel::Log) diff --git a/components/script/dom/constantsourcenode.rs b/components/script/dom/constantsourcenode.rs index 20de035e0f5..76735093d39 100644 --- a/components/script/dom/constantsourcenode.rs +++ b/components/script/dom/constantsourcenode.rs @@ -90,7 +90,7 @@ impl ConstantSourceNode { } } -impl ConstantSourceNodeMethods for ConstantSourceNode { +impl ConstantSourceNodeMethods<crate::DomTypeHolder> for ConstantSourceNode { // https://webaudio.github.io/web-audio-api/#dom-constantsourcenode-constantsourcenode fn Constructor( window: &Window, diff --git a/components/script/dom/crypto.rs b/components/script/dom/crypto.rs index 4f71d6a29c0..39ed78efae0 100644 --- a/components/script/dom/crypto.rs +++ b/components/script/dom/crypto.rs @@ -42,7 +42,7 @@ impl Crypto { } } -impl CryptoMethods for Crypto { +impl CryptoMethods<crate::DomTypeHolder> for Crypto { /// <https://w3c.github.io/webcrypto/#dfn-Crypto-attribute-subtle> fn Subtle(&self) -> DomRoot<SubtleCrypto> { self.subtle.or_init(|| SubtleCrypto::new(&self.global())) diff --git a/components/script/dom/cryptokey.rs b/components/script/dom/cryptokey.rs index 15918d66908..47e52cb1b5d 100644 --- a/components/script/dom/cryptokey.rs +++ b/components/script/dom/cryptokey.rs @@ -116,7 +116,7 @@ impl CryptoKey { } } -impl CryptoKeyMethods for CryptoKey { +impl CryptoKeyMethods<crate::DomTypeHolder> for CryptoKey { /// <https://w3c.github.io/webcrypto/#dom-cryptokey-type> fn Type(&self) -> KeyType { self.key_type diff --git a/components/script/dom/css.rs b/components/script/dom/css.rs index 99cc6c353e7..6105ce80629 100644 --- a/components/script/dom/css.rs +++ b/components/script/dom/css.rs @@ -25,7 +25,7 @@ pub struct CSS { reflector_: Reflector, } -impl CSSMethods for CSS { +impl CSSMethods<crate::DomTypeHolder> for CSS { /// <https://drafts.csswg.org/cssom/#the-css.escape()-method> fn Escape(_: &Window, ident: DOMString) -> Fallible<DOMString> { let mut escaped = String::new(); diff --git a/components/script/dom/cssconditionrule.rs b/components/script/dom/cssconditionrule.rs index bdda803c012..78d7cfa2524 100644 --- a/components/script/dom/cssconditionrule.rs +++ b/components/script/dom/cssconditionrule.rs @@ -39,7 +39,7 @@ impl CSSConditionRule { } } -impl CSSConditionRuleMethods for CSSConditionRule { +impl CSSConditionRuleMethods<crate::DomTypeHolder> for CSSConditionRule { /// <https://drafts.csswg.org/css-conditional-3/#dom-cssconditionrule-conditiontext> fn ConditionText(&self) -> DOMString { if let Some(rule) = self.downcast::<CSSMediaRule>() { diff --git a/components/script/dom/cssgroupingrule.rs b/components/script/dom/cssgroupingrule.rs index 60babba658c..8dbfd4ac7cc 100644 --- a/components/script/dom/cssgroupingrule.rs +++ b/components/script/dom/cssgroupingrule.rs @@ -58,7 +58,7 @@ impl CSSGroupingRule { } } -impl CSSGroupingRuleMethods for CSSGroupingRule { +impl CSSGroupingRuleMethods<crate::DomTypeHolder> for CSSGroupingRule { // https://drafts.csswg.org/cssom/#dom-cssgroupingrule-cssrules fn CssRules(&self) -> DomRoot<CSSRuleList> { // XXXManishearth check origin clean flag diff --git a/components/script/dom/cssimportrule.rs b/components/script/dom/cssimportrule.rs index d75ec291460..1bebbeb90f7 100644 --- a/components/script/dom/cssimportrule.rs +++ b/components/script/dom/cssimportrule.rs @@ -63,7 +63,7 @@ impl SpecificCSSRule for CSSImportRule { } } -impl CSSImportRuleMethods for CSSImportRule { +impl CSSImportRuleMethods<crate::DomTypeHolder> for CSSImportRule { /// <https://drafts.csswg.org/cssom-1/#dom-cssimportrule-layername> fn GetLayerName(&self) -> Option<DOMString> { let guard = self.cssrule.shared_lock().read(); diff --git a/components/script/dom/csskeyframerule.rs b/components/script/dom/csskeyframerule.rs index f53f68956fb..c30b6b28fbb 100644 --- a/components/script/dom/csskeyframerule.rs +++ b/components/script/dom/csskeyframerule.rs @@ -55,7 +55,7 @@ impl CSSKeyframeRule { } } -impl CSSKeyframeRuleMethods for CSSKeyframeRule { +impl CSSKeyframeRuleMethods<crate::DomTypeHolder> for CSSKeyframeRule { // https://drafts.csswg.org/css-animations/#dom-csskeyframerule-style fn Style(&self) -> DomRoot<CSSStyleDeclaration> { self.style_decl.or_init(|| { diff --git a/components/script/dom/csskeyframesrule.rs b/components/script/dom/csskeyframesrule.rs index 272e7086a41..4457bd0b117 100644 --- a/components/script/dom/csskeyframesrule.rs +++ b/components/script/dom/csskeyframesrule.rs @@ -88,7 +88,7 @@ impl CSSKeyframesRule { } } -impl CSSKeyframesRuleMethods for CSSKeyframesRule { +impl CSSKeyframesRuleMethods<crate::DomTypeHolder> for CSSKeyframesRule { // https://drafts.csswg.org/css-animations/#dom-csskeyframesrule-cssrules fn CssRules(&self) -> DomRoot<CSSRuleList> { self.rulelist() diff --git a/components/script/dom/csslayerblockrule.rs b/components/script/dom/csslayerblockrule.rs index 21db85c2f6d..dba11279a65 100644 --- a/components/script/dom/csslayerblockrule.rs +++ b/components/script/dom/csslayerblockrule.rs @@ -66,7 +66,7 @@ impl SpecificCSSRule for CSSLayerBlockRule { } } -impl CSSLayerBlockRuleMethods for CSSLayerBlockRule { +impl CSSLayerBlockRuleMethods<crate::DomTypeHolder> for CSSLayerBlockRule { /// <https://drafts.csswg.org/css-cascade-5/#dom-csslayerblockrule-name> fn Name(&self) -> DOMString { if let Some(name) = &self.layerblockrule.name { diff --git a/components/script/dom/csslayerstatementrule.rs b/components/script/dom/csslayerstatementrule.rs index dd9e632701d..8f012c0e41a 100644 --- a/components/script/dom/csslayerstatementrule.rs +++ b/components/script/dom/csslayerstatementrule.rs @@ -65,7 +65,7 @@ impl SpecificCSSRule for CSSLayerStatementRule { } } -impl CSSLayerStatementRuleMethods for CSSLayerStatementRule { +impl CSSLayerStatementRuleMethods<crate::DomTypeHolder> for CSSLayerStatementRule { /// <https://drafts.csswg.org/css-cascade-5/#dom-csslayerstatementrule-namelist> fn NameList(&self, cx: SafeJSContext, retval: MutableHandleValue) { let names: Vec<DOMString> = self diff --git a/components/script/dom/cssmediarule.rs b/components/script/dom/cssmediarule.rs index 3ecf63b1c22..53abf8ffa0a 100644 --- a/components/script/dom/cssmediarule.rs +++ b/components/script/dom/cssmediarule.rs @@ -78,7 +78,7 @@ impl SpecificCSSRule for CSSMediaRule { } } -impl CSSMediaRuleMethods for CSSMediaRule { +impl CSSMediaRuleMethods<crate::DomTypeHolder> for CSSMediaRule { // https://drafts.csswg.org/cssom/#dom-cssgroupingrule-media fn Media(&self) -> DomRoot<MediaList> { self.medialist() diff --git a/components/script/dom/cssnamespacerule.rs b/components/script/dom/cssnamespacerule.rs index 30395f0158b..ea2a10bb260 100644 --- a/components/script/dom/cssnamespacerule.rs +++ b/components/script/dom/cssnamespacerule.rs @@ -50,7 +50,7 @@ impl CSSNamespaceRule { } } -impl CSSNamespaceRuleMethods for CSSNamespaceRule { +impl CSSNamespaceRuleMethods<crate::DomTypeHolder> for CSSNamespaceRule { // https://drafts.csswg.org/cssom/#dom-cssnamespacerule-prefix fn Prefix(&self) -> DOMString { self.namespacerule diff --git a/components/script/dom/cssrule.rs b/components/script/dom/cssrule.rs index de648ca849b..6f688d5363e 100644 --- a/components/script/dom/cssrule.rs +++ b/components/script/dom/cssrule.rs @@ -148,7 +148,7 @@ impl CSSRule { } } -impl CSSRuleMethods for CSSRule { +impl CSSRuleMethods<crate::DomTypeHolder> for CSSRule { // https://drafts.csswg.org/cssom/#dom-cssrule-type fn Type(&self) -> u16 { let rule_type = self.as_specific().ty() as u16; diff --git a/components/script/dom/cssrulelist.rs b/components/script/dom/cssrulelist.rs index 72c1da22292..280374ba34d 100644 --- a/components/script/dom/cssrulelist.rs +++ b/components/script/dom/cssrulelist.rs @@ -207,7 +207,7 @@ impl CSSRuleList { } } -impl CSSRuleListMethods for CSSRuleList { +impl CSSRuleListMethods<crate::DomTypeHolder> for CSSRuleList { // https://drafts.csswg.org/cssom/#ref-for-dom-cssrulelist-item-1 fn Item(&self, idx: u32) -> Option<DomRoot<CSSRule>> { self.item(idx) diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index f981c131c3e..b2d6bb6637e 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -383,7 +383,7 @@ pub static ENABLED_LONGHAND_PROPERTIES: LazyLock<Vec<LonghandId>> = LazyLock::ne enabled_longhands }); -impl CSSStyleDeclarationMethods for CSSStyleDeclaration { +impl CSSStyleDeclarationMethods<crate::DomTypeHolder> for CSSStyleDeclaration { // https://dev.w3.org/csswg/cssom/#dom-cssstyledeclaration-length fn Length(&self) -> u32 { if self.readonly { diff --git a/components/script/dom/cssstylerule.rs b/components/script/dom/cssstylerule.rs index f2e6c279d0e..8a06cb79abd 100644 --- a/components/script/dom/cssstylerule.rs +++ b/components/script/dom/cssstylerule.rs @@ -71,7 +71,7 @@ impl SpecificCSSRule for CSSStyleRule { } } -impl CSSStyleRuleMethods for CSSStyleRule { +impl CSSStyleRuleMethods<crate::DomTypeHolder> for CSSStyleRule { // https://drafts.csswg.org/cssom/#dom-cssstylerule-style fn Style(&self) -> DomRoot<CSSStyleDeclaration> { self.style_decl.or_init(|| { diff --git a/components/script/dom/cssstylesheet.rs b/components/script/dom/cssstylesheet.rs index a83c90e0f78..f25ffa14b8e 100644 --- a/components/script/dom/cssstylesheet.rs +++ b/components/script/dom/cssstylesheet.rs @@ -114,7 +114,7 @@ impl CSSStyleSheet { } } -impl CSSStyleSheetMethods for CSSStyleSheet { +impl CSSStyleSheetMethods<crate::DomTypeHolder> for CSSStyleSheet { // https://drafts.csswg.org/cssom/#dom-cssstylesheet-cssrules fn GetCssRules(&self) -> Fallible<DomRoot<CSSRuleList>> { if !self.origin_clean.get() { diff --git a/components/script/dom/cssstylevalue.rs b/components/script/dom/cssstylevalue.rs index e65e929e520..83bab3a23a0 100644 --- a/components/script/dom/cssstylevalue.rs +++ b/components/script/dom/cssstylevalue.rs @@ -31,7 +31,7 @@ impl CSSStyleValue { } } -impl CSSStyleValueMethods for CSSStyleValue { +impl CSSStyleValueMethods<crate::DomTypeHolder> for CSSStyleValue { /// <https://drafts.css-houdini.org/css-typed-om-1/#CSSStyleValue-stringification-behavior> fn Stringifier(&self) -> DOMString { DOMString::from(&*self.value) diff --git a/components/script/dom/customelementregistry.rs b/components/script/dom/customelementregistry.rs index dd8675b066d..aa2bd0cc597 100644 --- a/components/script/dom/customelementregistry.rs +++ b/components/script/dom/customelementregistry.rs @@ -332,7 +332,7 @@ fn get_callback( } } -impl CustomElementRegistryMethods for CustomElementRegistry { +impl CustomElementRegistryMethods<crate::DomTypeHolder> for CustomElementRegistry { #[allow(unsafe_code, crown::unrooted_must_root)] /// <https://html.spec.whatwg.org/multipage/#dom-customelementregistry-define> fn Define( diff --git a/components/script/dom/customevent.rs b/components/script/dom/customevent.rs index 459747b6ca4..4b82f335643 100644 --- a/components/script/dom/customevent.rs +++ b/components/script/dom/customevent.rs @@ -84,7 +84,7 @@ impl CustomEvent { } } -impl CustomEventMethods for CustomEvent { +impl CustomEventMethods<crate::DomTypeHolder> for CustomEvent { // https://dom.spec.whatwg.org/#dom-customevent-customevent fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 5b106fd649b..0611908fe00 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -646,7 +646,7 @@ unsafe extern "C" fn interrupt_callback(cx: *mut JSContext) -> bool { !worker.is_closing() } -impl DedicatedWorkerGlobalScopeMethods for DedicatedWorkerGlobalScope { +impl DedicatedWorkerGlobalScopeMethods<crate::DomTypeHolder> for DedicatedWorkerGlobalScope { /// <https://html.spec.whatwg.org/multipage/#dom-dedicatedworkerglobalscope-postmessage> fn PostMessage( &self, diff --git a/components/script/dom/dissimilaroriginlocation.rs b/components/script/dom/dissimilaroriginlocation.rs index da2221bf9f6..338145fe978 100644 --- a/components/script/dom/dissimilaroriginlocation.rs +++ b/components/script/dom/dissimilaroriginlocation.rs @@ -44,7 +44,7 @@ impl DissimilarOriginLocation { } } -impl DissimilarOriginLocationMethods for DissimilarOriginLocation { +impl DissimilarOriginLocationMethods<crate::DomTypeHolder> for DissimilarOriginLocation { // https://html.spec.whatwg.org/multipage/#dom-location-href fn GetHref(&self) -> Fallible<USVString> { Err(Error::Security) diff --git a/components/script/dom/dissimilaroriginwindow.rs b/components/script/dom/dissimilaroriginwindow.rs index 6085de8fe8f..c673286e479 100644 --- a/components/script/dom/dissimilaroriginwindow.rs +++ b/components/script/dom/dissimilaroriginwindow.rs @@ -79,7 +79,7 @@ impl DissimilarOriginWindow { } } -impl DissimilarOriginWindowMethods for DissimilarOriginWindow { +impl DissimilarOriginWindowMethods<crate::DomTypeHolder> for DissimilarOriginWindow { // https://html.spec.whatwg.org/multipage/#dom-window fn Window(&self) -> DomRoot<WindowProxy> { self.window_proxy() diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 5baa48c4e33..dc228788b94 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -4269,7 +4269,7 @@ impl ProfilerMetadataFactory for Document { } #[allow(non_snake_case)] -impl DocumentMethods for Document { +impl DocumentMethods<crate::DomTypeHolder> for Document { // https://dom.spec.whatwg.org/#dom-document-document fn Constructor( window: &Window, diff --git a/components/script/dom/documentfragment.rs b/components/script/dom/documentfragment.rs index 5c8165c06a7..bbf382c584f 100644 --- a/components/script/dom/documentfragment.rs +++ b/components/script/dom/documentfragment.rs @@ -62,7 +62,7 @@ impl DocumentFragment { } } -impl DocumentFragmentMethods for DocumentFragment { +impl DocumentFragmentMethods<crate::DomTypeHolder> for DocumentFragment { // https://dom.spec.whatwg.org/#dom-documentfragment-documentfragment fn Constructor( window: &Window, diff --git a/components/script/dom/documenttype.rs b/components/script/dom/documenttype.rs index c0384650577..a9b6d696f97 100644 --- a/components/script/dom/documenttype.rs +++ b/components/script/dom/documenttype.rs @@ -71,7 +71,7 @@ impl DocumentType { } } -impl DocumentTypeMethods for DocumentType { +impl DocumentTypeMethods<crate::DomTypeHolder> for DocumentType { // https://dom.spec.whatwg.org/#dom-documenttype-name fn Name(&self) -> DOMString { self.name.clone() diff --git a/components/script/dom/domexception.rs b/components/script/dom/domexception.rs index 5f3ac73d3f2..136e86434f0 100644 --- a/components/script/dom/domexception.rs +++ b/components/script/dom/domexception.rs @@ -157,7 +157,7 @@ impl DOMException { } } -impl DOMExceptionMethods for DOMException { +impl DOMExceptionMethods<crate::DomTypeHolder> for DOMException { // https://webidl.spec.whatwg.org/#dom-domexception-domexception fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/domimplementation.rs b/components/script/dom/domimplementation.rs index 13b9d14ffe6..b034ad438e4 100644 --- a/components/script/dom/domimplementation.rs +++ b/components/script/dom/domimplementation.rs @@ -52,7 +52,7 @@ impl DOMImplementation { } // https://dom.spec.whatwg.org/#domimplementation -impl DOMImplementationMethods for DOMImplementation { +impl DOMImplementationMethods<crate::DomTypeHolder> for DOMImplementation { // https://dom.spec.whatwg.org/#dom-domimplementation-createdocumenttype fn CreateDocumentType( &self, diff --git a/components/script/dom/dommatrix.rs b/components/script/dom/dommatrix.rs index 95ad8fc7ef2..b4a6f72b6d1 100644 --- a/components/script/dom/dommatrix.rs +++ b/components/script/dom/dommatrix.rs @@ -66,7 +66,7 @@ impl DOMMatrix { } #[allow(non_snake_case)] -impl DOMMatrixMethods for DOMMatrix { +impl DOMMatrixMethods<crate::DomTypeHolder> for DOMMatrix { // https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-dommatrixreadonly fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/dommatrixreadonly.rs b/components/script/dom/dommatrixreadonly.rs index 8abb924ec6d..f5d5ea4b2d9 100644 --- a/components/script/dom/dommatrixreadonly.rs +++ b/components/script/dom/dommatrixreadonly.rs @@ -433,7 +433,7 @@ impl DOMMatrixReadOnly { } #[allow(non_snake_case)] -impl DOMMatrixReadOnlyMethods for DOMMatrixReadOnly { +impl DOMMatrixReadOnlyMethods<crate::DomTypeHolder> for DOMMatrixReadOnly { // https://drafts.fxtf.org/geometry-1/#dom-dommatrixreadonly-dommatrixreadonly fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/domparser.rs b/components/script/dom/domparser.rs index c40ed43fd7e..74d105f68cd 100644 --- a/components/script/dom/domparser.rs +++ b/components/script/dom/domparser.rs @@ -47,7 +47,7 @@ impl DOMParser { } } -impl DOMParserMethods for DOMParser { +impl DOMParserMethods<crate::DomTypeHolder> for DOMParser { /// <https://html.spec.whatwg.org/multipage/#dom-domparser-constructor> fn Constructor( window: &Window, diff --git a/components/script/dom/dompoint.rs b/components/script/dom/dompoint.rs index 0e8d5ad1004..4be2c2cdf8b 100644 --- a/components/script/dom/dompoint.rs +++ b/components/script/dom/dompoint.rs @@ -65,7 +65,7 @@ impl DOMPoint { } } -impl DOMPointMethods for DOMPoint { +impl DOMPointMethods<crate::DomTypeHolder> for DOMPoint { // https://drafts.fxtf.org/geometry/#dom-dompointreadonly-dompointreadonly fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/dompointreadonly.rs b/components/script/dom/dompointreadonly.rs index a52c0d7b65b..bb926511b96 100644 --- a/components/script/dom/dompointreadonly.rs +++ b/components/script/dom/dompointreadonly.rs @@ -67,7 +67,7 @@ impl DOMPointReadOnly { } #[allow(non_snake_case)] -impl DOMPointReadOnlyMethods for DOMPointReadOnly { +impl DOMPointReadOnlyMethods<crate::DomTypeHolder> for DOMPointReadOnly { // https://drafts.fxtf.org/geometry/#dom-dompoint-dompoint fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/domquad.rs b/components/script/dom/domquad.rs index bbcaa115943..86888845485 100644 --- a/components/script/dom/domquad.rs +++ b/components/script/dom/domquad.rs @@ -66,7 +66,7 @@ impl DOMQuad { } } -impl DOMQuadMethods for DOMQuad { +impl DOMQuadMethods<crate::DomTypeHolder> for DOMQuad { // https://drafts.fxtf.org/geometry/#dom-domquad-domquad fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/domrect.rs b/components/script/dom/domrect.rs index 5ab05b94ef4..01bf727629d 100644 --- a/components/script/dom/domrect.rs +++ b/components/script/dom/domrect.rs @@ -57,7 +57,7 @@ impl DOMRect { } } -impl DOMRectMethods for DOMRect { +impl DOMRectMethods<crate::DomTypeHolder> for DOMRect { // https://drafts.fxtf.org/geometry/#dom-domrect-domrect fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/domrectlist.rs b/components/script/dom/domrectlist.rs index 2762ddab232..94e00c2c0c4 100644 --- a/components/script/dom/domrectlist.rs +++ b/components/script/dom/domrectlist.rs @@ -48,7 +48,7 @@ impl DOMRectList { } } -impl DOMRectListMethods for DOMRectList { +impl DOMRectListMethods<crate::DomTypeHolder> for DOMRectList { /// <https://drafts.fxtf.org/geometry/#DOMRectList> fn Item(&self, index: u32) -> Option<DomRoot<DOMRect>> { self.rects.borrow().get(index as usize).map(Dom::as_rooted) diff --git a/components/script/dom/domrectreadonly.rs b/components/script/dom/domrectreadonly.rs index 125122853af..239dea9060b 100644 --- a/components/script/dom/domrectreadonly.rs +++ b/components/script/dom/domrectreadonly.rs @@ -72,7 +72,7 @@ impl DOMRectReadOnly { } } -impl DOMRectReadOnlyMethods for DOMRectReadOnly { +impl DOMRectReadOnlyMethods<crate::DomTypeHolder> for DOMRectReadOnly { // https://drafts.fxtf.org/geometry/#dom-domrectreadonly-domrectreadonly fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/domstringlist.rs b/components/script/dom/domstringlist.rs index 25c770f1e4d..f64841232e0 100644 --- a/components/script/dom/domstringlist.rs +++ b/components/script/dom/domstringlist.rs @@ -32,7 +32,7 @@ impl DOMStringList { } // https://html.spec.whatwg.org/multipage/#domstringlist -impl DOMStringListMethods for DOMStringList { +impl DOMStringListMethods<crate::DomTypeHolder> for DOMStringList { // https://html.spec.whatwg.org/multipage/#dom-domstringlist-length fn Length(&self) -> u32 { self.strings.len() as u32 diff --git a/components/script/dom/domstringmap.rs b/components/script/dom/domstringmap.rs index 68c5d16a880..eab7f9d3b17 100644 --- a/components/script/dom/domstringmap.rs +++ b/components/script/dom/domstringmap.rs @@ -34,7 +34,7 @@ impl DOMStringMap { } // https://html.spec.whatwg.org/multipage/#domstringmap -impl DOMStringMapMethods for DOMStringMap { +impl DOMStringMapMethods<crate::DomTypeHolder> for DOMStringMap { // https://html.spec.whatwg.org/multipage/#dom-domstringmap-removeitem fn NamedDeleter(&self, name: DOMString) { self.element.delete_custom_attr(name) diff --git a/components/script/dom/domtokenlist.rs b/components/script/dom/domtokenlist.rs index 4b045493232..8476dc06cf8 100644 --- a/components/script/dom/domtokenlist.rs +++ b/components/script/dom/domtokenlist.rs @@ -101,7 +101,7 @@ impl DOMTokenList { } /// <https://dom.spec.whatwg.org/#domtokenlist> -impl DOMTokenListMethods for DOMTokenList { +impl DOMTokenListMethods<crate::DomTypeHolder> for DOMTokenList { /// <https://dom.spec.whatwg.org/#dom-domtokenlist-length> fn Length(&self) -> u32 { self.attribute() diff --git a/components/script/dom/dynamicmoduleowner.rs b/components/script/dom/dynamicmoduleowner.rs index 698ce88ee5a..889dbae5d84 100644 --- a/components/script/dom/dynamicmoduleowner.rs +++ b/components/script/dom/dynamicmoduleowner.rs @@ -48,7 +48,7 @@ impl DynamicModuleOwner { } } -impl DynamicModuleOwnerMethods for DynamicModuleOwner { +impl DynamicModuleOwnerMethods<crate::DomTypeHolder> for DynamicModuleOwner { // https://html.spec.whatwg.org/multipage/#integration-with-the-javascript-module-system:import() fn Promise(&self) -> Rc<Promise> { self.promise.clone() diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 41aec11ca90..1ee2169cfd6 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -2081,7 +2081,7 @@ impl Element { } } -impl ElementMethods for Element { +impl ElementMethods<crate::DomTypeHolder> for Element { // https://dom.spec.whatwg.org/#dom-element-namespaceuri fn GetNamespaceURI(&self) -> Option<DOMString> { Node::namespace_to_string(self.namespace.clone()) diff --git a/components/script/dom/elementinternals.rs b/components/script/dom/elementinternals.rs index a3ef4d57e9b..bf6e9059651 100644 --- a/components/script/dom/elementinternals.rs +++ b/components/script/dom/elementinternals.rs @@ -183,7 +183,7 @@ impl ElementInternals { } } -impl ElementInternalsMethods for ElementInternals { +impl ElementInternalsMethods<crate::DomTypeHolder> for ElementInternals { /// <https://html.spec.whatwg.org/multipage#dom-elementinternals-setformvalue> fn SetFormValue( &self, diff --git a/components/script/dom/errorevent.rs b/components/script/dom/errorevent.rs index 1bd0f9f3af8..f2075f90708 100644 --- a/components/script/dom/errorevent.rs +++ b/components/script/dom/errorevent.rs @@ -102,7 +102,7 @@ impl ErrorEvent { } } -impl ErrorEventMethods for ErrorEvent { +impl ErrorEventMethods<crate::DomTypeHolder> for ErrorEvent { // https://html.spec.whatwg.org/multipage/#errorevent fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index d02a2b79e93..a591656a694 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -387,7 +387,7 @@ impl Event { } } -impl EventMethods for Event { +impl EventMethods<crate::DomTypeHolder> for Event { /// <https://dom.spec.whatwg.org/#dom-event-event> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/eventsource.rs b/components/script/dom/eventsource.rs index 8e9249fbd33..504968931db 100644 --- a/components/script/dom/eventsource.rs +++ b/components/script/dom/eventsource.rs @@ -530,7 +530,7 @@ impl Drop for EventSource { } } -impl EventSourceMethods for EventSource { +impl EventSourceMethods<crate::DomTypeHolder> for EventSource { // https://html.spec.whatwg.org/multipage/#dom-eventsource fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index b097080bbc4..09931ec0a17 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -783,7 +783,7 @@ impl EventTarget { } } -impl EventTargetMethods for EventTarget { +impl EventTargetMethods<crate::DomTypeHolder> for EventTarget { // https://dom.spec.whatwg.org/#dom-eventtarget-eventtarget fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/extendableevent.rs b/components/script/dom/extendableevent.rs index 2249afb880d..c5e0bac0baa 100644 --- a/components/script/dom/extendableevent.rs +++ b/components/script/dom/extendableevent.rs @@ -67,7 +67,7 @@ impl ExtendableEvent { } } -impl ExtendableEventMethods for ExtendableEvent { +impl ExtendableEventMethods<crate::DomTypeHolder> for ExtendableEvent { // https://w3c.github.io/ServiceWorker/#dom-extendableevent-extendableevent fn Constructor( worker: &ServiceWorkerGlobalScope, diff --git a/components/script/dom/extendablemessageevent.rs b/components/script/dom/extendablemessageevent.rs index 1bad29e3c78..484fa06cf84 100644 --- a/components/script/dom/extendablemessageevent.rs +++ b/components/script/dom/extendablemessageevent.rs @@ -161,7 +161,7 @@ impl ExtendableMessageEvent { } } -impl ExtendableMessageEventMethods for ExtendableMessageEvent { +impl ExtendableMessageEventMethods<crate::DomTypeHolder> for ExtendableMessageEvent { /// <https://w3c.github.io/ServiceWorker/#dom-extendablemessageevent-extendablemessageevent> fn Constructor( worker: &ServiceWorkerGlobalScope, diff --git a/components/script/dom/fakexrdevice.rs b/components/script/dom/fakexrdevice.rs index e2d79660833..7024aa9dc65 100644 --- a/components/script/dom/fakexrdevice.rs +++ b/components/script/dom/fakexrdevice.rs @@ -182,7 +182,7 @@ impl From<FakeXRRegionType> for EntityType { } } -impl FakeXRDeviceMethods for FakeXRDevice { +impl FakeXRDeviceMethods<crate::DomTypeHolder> for FakeXRDevice { /// <https://github.com/immersive-web/webxr-test-api/blob/master/explainer.md> fn SetViews( &self, diff --git a/components/script/dom/fakexrinputcontroller.rs b/components/script/dom/fakexrinputcontroller.rs index 7f620639e16..a9bf8038f5e 100644 --- a/components/script/dom/fakexrinputcontroller.rs +++ b/components/script/dom/fakexrinputcontroller.rs @@ -61,7 +61,7 @@ impl FakeXRInputController { } } -impl FakeXRInputControllerMethods for FakeXRInputController { +impl FakeXRInputControllerMethods<crate::DomTypeHolder> for FakeXRInputController { /// <https://immersive-web.github.io/webxr-test-api/#dom-fakexrinputcontroller-setpointerorigin> fn SetPointerOrigin(&self, origin: &FakeXRRigidTransformInit, _emulated: bool) -> Fallible<()> { self.send_message(MockInputMsg::SetPointerOrigin(Some(get_origin(origin)?))); diff --git a/components/script/dom/file.rs b/components/script/dom/file.rs index 21127331954..5fa55ddf4f5 100644 --- a/components/script/dom/file.rs +++ b/components/script/dom/file.rs @@ -102,7 +102,7 @@ impl File { } } -impl FileMethods for File { +impl FileMethods<crate::DomTypeHolder> for File { // https://w3c.github.io/FileAPI/#file-constructor #[allow(non_snake_case)] fn Constructor( diff --git a/components/script/dom/filelist.rs b/components/script/dom/filelist.rs index d2b647273ba..44afd40f418 100644 --- a/components/script/dom/filelist.rs +++ b/components/script/dom/filelist.rs @@ -43,7 +43,7 @@ impl FileList { } } -impl FileListMethods for FileList { +impl FileListMethods<crate::DomTypeHolder> for FileList { // https://w3c.github.io/FileAPI/#dfn-length fn Length(&self) -> u32 { self.list.len() as u32 diff --git a/components/script/dom/filereader.rs b/components/script/dom/filereader.rs index 20831493de7..e8e697eec90 100644 --- a/components/script/dom/filereader.rs +++ b/components/script/dom/filereader.rs @@ -326,7 +326,7 @@ impl FileReader { } } -impl FileReaderMethods for FileReader { +impl FileReaderMethods<crate::DomTypeHolder> for FileReader { // https://w3c.github.io/FileAPI/#filereaderConstrctr fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/filereadersync.rs b/components/script/dom/filereadersync.rs index 5ef1babfea7..fa312532eb9 100644 --- a/components/script/dom/filereadersync.rs +++ b/components/script/dom/filereadersync.rs @@ -51,7 +51,7 @@ impl FileReaderSync { } } -impl FileReaderSyncMethods for FileReaderSync { +impl FileReaderSyncMethods<crate::DomTypeHolder> for FileReaderSync { /// <https://w3c.github.io/FileAPI/#filereadersyncConstrctr> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/focusevent.rs b/components/script/dom/focusevent.rs index 11d1997d5aa..0f9eced513c 100644 --- a/components/script/dom/focusevent.rs +++ b/components/script/dom/focusevent.rs @@ -96,7 +96,7 @@ impl FocusEvent { } } -impl FocusEventMethods for FocusEvent { +impl FocusEventMethods<crate::DomTypeHolder> for FocusEvent { // https://w3c.github.io/uievents/#dom-focusevent-focusevent fn Constructor( window: &Window, diff --git a/components/script/dom/fontfaceset.rs b/components/script/dom/fontfaceset.rs index fa83e8708a1..ac8cd1baa78 100644 --- a/components/script/dom/fontfaceset.rs +++ b/components/script/dom/fontfaceset.rs @@ -48,7 +48,7 @@ impl FontFaceSet { } } -impl FontFaceSetMethods for FontFaceSet { +impl FontFaceSetMethods<crate::DomTypeHolder> for FontFaceSet { /// <https://drafts.csswg.org/css-font-loading/#dom-fontfaceset-ready> fn Ready(&self) -> Rc<Promise> { self.promise.clone() diff --git a/components/script/dom/formdata.rs b/components/script/dom/formdata.rs index b1d4f6af947..bcc0f8156c1 100644 --- a/components/script/dom/formdata.rs +++ b/components/script/dom/formdata.rs @@ -68,7 +68,7 @@ impl FormData { } } -impl FormDataMethods for FormData { +impl FormDataMethods<crate::DomTypeHolder> for FormData { // https://xhr.spec.whatwg.org/#dom-formdata fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/formdataevent.rs b/components/script/dom/formdataevent.rs index a4f1b5a8513..fc1134f0f80 100644 --- a/components/script/dom/formdataevent.rs +++ b/components/script/dom/formdataevent.rs @@ -67,7 +67,7 @@ impl FormDataEvent { } } -impl FormDataEventMethods for FormDataEvent { +impl FormDataEventMethods<crate::DomTypeHolder> for FormDataEvent { // https://html.spec.whatwg.org/multipage/#formdataevent fn Constructor( window: &Window, diff --git a/components/script/dom/gainnode.rs b/components/script/dom/gainnode.rs index aa03d616cd6..e8f81904fcc 100644 --- a/components/script/dom/gainnode.rs +++ b/components/script/dom/gainnode.rs @@ -92,7 +92,7 @@ impl GainNode { } } -impl GainNodeMethods for GainNode { +impl GainNodeMethods<crate::DomTypeHolder> for GainNode { // https://webaudio.github.io/web-audio-api/#dom-gainnode-gainnode fn Constructor( window: &Window, diff --git a/components/script/dom/gamepad.rs b/components/script/dom/gamepad.rs index c7f78a666be..ae3d75f6030 100644 --- a/components/script/dom/gamepad.rs +++ b/components/script/dom/gamepad.rs @@ -158,7 +158,7 @@ impl Gamepad { } } -impl GamepadMethods for Gamepad { +impl GamepadMethods<crate::DomTypeHolder> for Gamepad { // https://w3c.github.io/gamepad/#dom-gamepad-id fn Id(&self) -> DOMString { DOMString::from(self.id.clone()) diff --git a/components/script/dom/gamepadbutton.rs b/components/script/dom/gamepadbutton.rs index c23b2848379..7ed3ed56728 100644 --- a/components/script/dom/gamepadbutton.rs +++ b/components/script/dom/gamepadbutton.rs @@ -38,7 +38,7 @@ impl GamepadButton { } } -impl GamepadButtonMethods for GamepadButton { +impl GamepadButtonMethods<crate::DomTypeHolder> for GamepadButton { // https://www.w3.org/TR/gamepad/#widl-GamepadButton-pressed fn Pressed(&self) -> bool { self.pressed.get() diff --git a/components/script/dom/gamepadbuttonlist.rs b/components/script/dom/gamepadbuttonlist.rs index 961f265e37f..ef0739ee060 100644 --- a/components/script/dom/gamepadbuttonlist.rs +++ b/components/script/dom/gamepadbuttonlist.rs @@ -31,7 +31,7 @@ impl GamepadButtonList { } } -impl GamepadButtonListMethods for GamepadButtonList { +impl GamepadButtonListMethods<crate::DomTypeHolder> for GamepadButtonList { // https://w3c.github.io/gamepad/#dom-gamepad-buttons fn Length(&self) -> u32 { self.list.len() as u32 diff --git a/components/script/dom/gamepadevent.rs b/components/script/dom/gamepadevent.rs index 13020205110..ad835e9f1e5 100644 --- a/components/script/dom/gamepadevent.rs +++ b/components/script/dom/gamepadevent.rs @@ -87,7 +87,7 @@ impl GamepadEvent { } } -impl GamepadEventMethods for GamepadEvent { +impl GamepadEventMethods<crate::DomTypeHolder> for GamepadEvent { // https://w3c.github.io/gamepad/#gamepadevent-interface fn Constructor( window: &Window, diff --git a/components/script/dom/gamepadhapticactuator.rs b/components/script/dom/gamepadhapticactuator.rs index 10be49dcfee..edffeddd901 100644 --- a/components/script/dom/gamepadhapticactuator.rs +++ b/components/script/dom/gamepadhapticactuator.rs @@ -132,7 +132,7 @@ impl GamepadHapticActuator { } } -impl GamepadHapticActuatorMethods for GamepadHapticActuator { +impl GamepadHapticActuatorMethods<crate::DomTypeHolder> for GamepadHapticActuator { /// <https://www.w3.org/TR/gamepad/#dom-gamepadhapticactuator-effects> fn Effects(&self, cx: JSContext, retval: MutableHandleValue) { to_frozen_array(self.effects.as_slice(), cx, retval) diff --git a/components/script/dom/gamepadpose.rs b/components/script/dom/gamepadpose.rs index d17681b3a0a..012b1dd7679 100644 --- a/components/script/dom/gamepadpose.rs +++ b/components/script/dom/gamepadpose.rs @@ -49,7 +49,7 @@ impl GamepadPose { } } -impl GamepadPoseMethods for GamepadPose { +impl GamepadPoseMethods<crate::DomTypeHolder> for GamepadPose { // https://w3c.github.io/gamepad/extensions.html#dom-gamepadpose-position fn GetPosition(&self, _cx: JSContext) -> Option<Float32Array> { self.position.buffer_to_option() diff --git a/components/script/dom/gpu.rs b/components/script/dom/gpu.rs index 753ff82b7ab..f6302ca59f1 100644 --- a/components/script/dom/gpu.rs +++ b/components/script/dom/gpu.rs @@ -104,7 +104,7 @@ pub fn response_async<T: AsyncWGPUListener + DomObject + 'static>( action_sender } -impl GPUMethods for GPU { +impl GPUMethods<crate::DomTypeHolder> for GPU { // https://gpuweb.github.io/gpuweb/#dom-gpu-requestadapter fn RequestAdapter( &self, diff --git a/components/script/dom/gpuadapter.rs b/components/script/dom/gpuadapter.rs index 9509475144a..4fa8d12dfa7 100644 --- a/components/script/dom/gpuadapter.rs +++ b/components/script/dom/gpuadapter.rs @@ -106,7 +106,7 @@ impl Drop for GPUAdapter { } } -impl GPUAdapterMethods for GPUAdapter { +impl GPUAdapterMethods<crate::DomTypeHolder> for GPUAdapter { /// <https://gpuweb.github.io/gpuweb/#dom-gpuadapter-requestdevice> fn RequestDevice( &self, diff --git a/components/script/dom/gpuadapterinfo.rs b/components/script/dom/gpuadapterinfo.rs index a31454185c6..bb9a9aeb863 100644 --- a/components/script/dom/gpuadapterinfo.rs +++ b/components/script/dom/gpuadapterinfo.rs @@ -34,7 +34,7 @@ impl GPUAdapterInfo { } // TODO: wgpu does not expose right fields right now -impl GPUAdapterInfoMethods for GPUAdapterInfo { +impl GPUAdapterInfoMethods<crate::DomTypeHolder> for GPUAdapterInfo { /// <https://gpuweb.github.io/gpuweb/#dom-gpuadapterinfo-vendor> fn Vendor(&self) -> DOMString { DOMString::new() diff --git a/components/script/dom/gpubindgroup.rs b/components/script/dom/gpubindgroup.rs index 964959e40c0..7992e3825d0 100644 --- a/components/script/dom/gpubindgroup.rs +++ b/components/script/dom/gpubindgroup.rs @@ -129,7 +129,7 @@ impl Drop for GPUBindGroup { } } -impl GPUBindGroupMethods for GPUBindGroup { +impl GPUBindGroupMethods<crate::DomTypeHolder> for GPUBindGroup { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpubindgrouplayout.rs b/components/script/dom/gpubindgrouplayout.rs index 4c2d2413a7a..c09c36ade58 100644 --- a/components/script/dom/gpubindgrouplayout.rs +++ b/components/script/dom/gpubindgrouplayout.rs @@ -126,7 +126,7 @@ impl Drop for GPUBindGroupLayout { } } -impl GPUBindGroupLayoutMethods for GPUBindGroupLayout { +impl GPUBindGroupLayoutMethods<crate::DomTypeHolder> for GPUBindGroupLayout { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpubuffer.rs b/components/script/dom/gpubuffer.rs index 0cae783d653..e7bddcde8f1 100644 --- a/components/script/dom/gpubuffer.rs +++ b/components/script/dom/gpubuffer.rs @@ -184,7 +184,7 @@ impl Drop for GPUBuffer { } } -impl GPUBufferMethods for GPUBuffer { +impl GPUBufferMethods<crate::DomTypeHolder> for GPUBuffer { #[allow(unsafe_code)] /// <https://gpuweb.github.io/gpuweb/#dom-gpubuffer-unmap> fn Unmap(&self) { diff --git a/components/script/dom/gpucanvascontext.rs b/components/script/dom/gpucanvascontext.rs index 1309ca4c32d..c20f1d1d877 100644 --- a/components/script/dom/gpucanvascontext.rs +++ b/components/script/dom/gpucanvascontext.rs @@ -341,7 +341,7 @@ impl LayoutCanvasRenderingContextHelpers for LayoutDom<'_, GPUCanvasContext> { } } -impl GPUCanvasContextMethods for GPUCanvasContext { +impl GPUCanvasContextMethods<crate::DomTypeHolder> for GPUCanvasContext { /// <https://gpuweb.github.io/gpuweb/#dom-gpucanvascontext-canvas> fn Canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas { self.canvas.clone() diff --git a/components/script/dom/gpucommandbuffer.rs b/components/script/dom/gpucommandbuffer.rs index 7bcff2d9000..120af69a480 100644 --- a/components/script/dom/gpucommandbuffer.rs +++ b/components/script/dom/gpucommandbuffer.rs @@ -75,7 +75,7 @@ impl GPUCommandBuffer { } } -impl GPUCommandBufferMethods for GPUCommandBuffer { +impl GPUCommandBufferMethods<crate::DomTypeHolder> for GPUCommandBuffer { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpucommandencoder.rs b/components/script/dom/gpucommandencoder.rs index 8b62cbb8030..9dcec03540c 100644 --- a/components/script/dom/gpucommandencoder.rs +++ b/components/script/dom/gpucommandencoder.rs @@ -110,7 +110,7 @@ impl GPUCommandEncoder { } } -impl GPUCommandEncoderMethods for GPUCommandEncoder { +impl GPUCommandEncoderMethods<crate::DomTypeHolder> for GPUCommandEncoder { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpucompilationinfo.rs b/components/script/dom/gpucompilationinfo.rs index a54b3e81e41..4bfa849d49e 100644 --- a/components/script/dom/gpucompilationinfo.rs +++ b/components/script/dom/gpucompilationinfo.rs @@ -56,7 +56,7 @@ impl GPUCompilationInfo { } } -impl GPUCompilationInfoMethods for GPUCompilationInfo { +impl GPUCompilationInfoMethods<crate::DomTypeHolder> for GPUCompilationInfo { /// <https://gpuweb.github.io/gpuweb/#dom-gpucompilationinfo-messages> fn Messages(&self, cx: JSContext, retval: MutableHandleValue) { to_frozen_array(self.msg.as_slice(), cx, retval) diff --git a/components/script/dom/gpucompilationmessage.rs b/components/script/dom/gpucompilationmessage.rs index cf524965153..dbdf87bdede 100644 --- a/components/script/dom/gpucompilationmessage.rs +++ b/components/script/dom/gpucompilationmessage.rs @@ -77,7 +77,7 @@ impl GPUCompilationMessage { } } -impl GPUCompilationMessageMethods for GPUCompilationMessage { +impl GPUCompilationMessageMethods<crate::DomTypeHolder> for GPUCompilationMessage { /// <https://gpuweb.github.io/gpuweb/#dom-gpucompilationmessage-message> fn Message(&self) -> DOMString { self.message.to_owned() diff --git a/components/script/dom/gpucomputepassencoder.rs b/components/script/dom/gpucomputepassencoder.rs index ccdfbb05f99..e75157b32fc 100644 --- a/components/script/dom/gpucomputepassencoder.rs +++ b/components/script/dom/gpucomputepassencoder.rs @@ -63,7 +63,7 @@ impl GPUComputePassEncoder { } } -impl GPUComputePassEncoderMethods for GPUComputePassEncoder { +impl GPUComputePassEncoderMethods<crate::DomTypeHolder> for GPUComputePassEncoder { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpucomputepipeline.rs b/components/script/dom/gpucomputepipeline.rs index cca5e414191..4d905126c71 100644 --- a/components/script/dom/gpucomputepipeline.rs +++ b/components/script/dom/gpucomputepipeline.rs @@ -101,7 +101,7 @@ impl GPUComputePipeline { } } -impl GPUComputePipelineMethods for GPUComputePipeline { +impl GPUComputePipelineMethods<crate::DomTypeHolder> for GPUComputePipeline { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpudevice.rs b/components/script/dom/gpudevice.rs index 51361118f8d..b62f800f3e6 100644 --- a/components/script/dom/gpudevice.rs +++ b/components/script/dom/gpudevice.rs @@ -377,7 +377,7 @@ impl GPUDevice { } } -impl GPUDeviceMethods for GPUDevice { +impl GPUDeviceMethods<crate::DomTypeHolder> for GPUDevice { /// <https://gpuweb.github.io/gpuweb/#dom-gpudevice-features> fn Features(&self) -> DomRoot<GPUSupportedFeatures> { DomRoot::from_ref(&self.features) diff --git a/components/script/dom/gpudevicelostinfo.rs b/components/script/dom/gpudevicelostinfo.rs index 1616e9d7169..3219c0fe202 100644 --- a/components/script/dom/gpudevicelostinfo.rs +++ b/components/script/dom/gpudevicelostinfo.rs @@ -41,7 +41,7 @@ impl GPUDeviceLostInfo { } } -impl GPUDeviceLostInfoMethods for GPUDeviceLostInfo { +impl GPUDeviceLostInfoMethods<crate::DomTypeHolder> for GPUDeviceLostInfo { /// <https://gpuweb.github.io/gpuweb/#dom-gpudevicelostinfo-message> fn Message(&self) -> DOMString { self.message.clone() diff --git a/components/script/dom/gpuerror.rs b/components/script/dom/gpuerror.rs index 73464543753..20ecff210d6 100644 --- a/components/script/dom/gpuerror.rs +++ b/components/script/dom/gpuerror.rs @@ -72,7 +72,7 @@ impl GPUError { } } -impl GPUErrorMethods for GPUError { +impl GPUErrorMethods<crate::DomTypeHolder> for GPUError { /// <https://gpuweb.github.io/gpuweb/#dom-gpuerror-message> fn Message(&self) -> DOMString { self.message.clone() diff --git a/components/script/dom/gpuinternalerror.rs b/components/script/dom/gpuinternalerror.rs index 224319298fb..4be5be9a22e 100644 --- a/components/script/dom/gpuinternalerror.rs +++ b/components/script/dom/gpuinternalerror.rs @@ -40,7 +40,7 @@ impl GPUInternalError { } } -impl GPUInternalErrorMethods for GPUInternalError { +impl GPUInternalErrorMethods<crate::DomTypeHolder> for GPUInternalError { /// <https://gpuweb.github.io/gpuweb/#dom-GPUInternalError-GPUInternalError> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/gpuoutofmemoryerror.rs b/components/script/dom/gpuoutofmemoryerror.rs index 588bfc86cfc..22763e89c48 100644 --- a/components/script/dom/gpuoutofmemoryerror.rs +++ b/components/script/dom/gpuoutofmemoryerror.rs @@ -40,7 +40,7 @@ impl GPUOutOfMemoryError { } } -impl GPUOutOfMemoryErrorMethods for GPUOutOfMemoryError { +impl GPUOutOfMemoryErrorMethods<crate::DomTypeHolder> for GPUOutOfMemoryError { /// <https://gpuweb.github.io/gpuweb/#dom-GPUOutOfMemoryError-GPUOutOfMemoryError> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/gpupipelineerror.rs b/components/script/dom/gpupipelineerror.rs index 23b438d22fa..d8a4bb5a587 100644 --- a/components/script/dom/gpupipelineerror.rs +++ b/components/script/dom/gpupipelineerror.rs @@ -55,7 +55,7 @@ impl GPUPipelineError { } } -impl GPUPipelineErrorMethods for GPUPipelineError { +impl GPUPipelineErrorMethods<crate::DomTypeHolder> for GPUPipelineError { /// <https://gpuweb.github.io/gpuweb/#dom-gpupipelineerror-constructor> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/gpupipelinelayout.rs b/components/script/dom/gpupipelinelayout.rs index c97cee67b5b..c1cbbdb72ab 100644 --- a/components/script/dom/gpupipelinelayout.rs +++ b/components/script/dom/gpupipelinelayout.rs @@ -114,7 +114,7 @@ impl GPUPipelineLayout { } } -impl GPUPipelineLayoutMethods for GPUPipelineLayout { +impl GPUPipelineLayoutMethods<crate::DomTypeHolder> for GPUPipelineLayout { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpuqueryset.rs b/components/script/dom/gpuqueryset.rs index 51f859b6e13..40e734f9eec 100644 --- a/components/script/dom/gpuqueryset.rs +++ b/components/script/dom/gpuqueryset.rs @@ -17,7 +17,7 @@ pub struct GPUQuerySet { } // TODO: wgpu does not expose right fields right now -impl GPUQuerySetMethods for GPUQuerySet { +impl GPUQuerySetMethods<crate::DomTypeHolder> for GPUQuerySet { /// <https://gpuweb.github.io/gpuweb/#dom-gpuqueryset-destroy> fn Destroy(&self) { todo!() diff --git a/components/script/dom/gpuqueue.rs b/components/script/dom/gpuqueue.rs index f371743e681..40983567990 100644 --- a/components/script/dom/gpuqueue.rs +++ b/components/script/dom/gpuqueue.rs @@ -64,7 +64,7 @@ impl GPUQueue { } } -impl GPUQueueMethods for GPUQueue { +impl GPUQueueMethods<crate::DomTypeHolder> for GPUQueue { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpurenderbundle.rs b/components/script/dom/gpurenderbundle.rs index 92827df6ab7..aae120b970b 100644 --- a/components/script/dom/gpurenderbundle.rs +++ b/components/script/dom/gpurenderbundle.rs @@ -66,7 +66,7 @@ impl GPURenderBundle { } } -impl GPURenderBundleMethods for GPURenderBundle { +impl GPURenderBundleMethods<crate::DomTypeHolder> for GPURenderBundle { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpurenderbundleencoder.rs b/components/script/dom/gpurenderbundleencoder.rs index 9a494a1d628..fdaf6fa534e 100644 --- a/components/script/dom/gpurenderbundleencoder.rs +++ b/components/script/dom/gpurenderbundleencoder.rs @@ -124,7 +124,7 @@ impl GPURenderBundleEncoder { } } -impl GPURenderBundleEncoderMethods for GPURenderBundleEncoder { +impl GPURenderBundleEncoderMethods<crate::DomTypeHolder> for GPURenderBundleEncoder { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpurenderpassencoder.rs b/components/script/dom/gpurenderpassencoder.rs index a2449bc8878..36d425a4789 100644 --- a/components/script/dom/gpurenderpassencoder.rs +++ b/components/script/dom/gpurenderpassencoder.rs @@ -79,7 +79,7 @@ impl GPURenderPassEncoder { } } -impl GPURenderPassEncoderMethods for GPURenderPassEncoder { +impl GPURenderPassEncoderMethods<crate::DomTypeHolder> for GPURenderPassEncoder { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpurenderpipeline.rs b/components/script/dom/gpurenderpipeline.rs index 96de0ffd925..0cf8754ecbf 100644 --- a/components/script/dom/gpurenderpipeline.rs +++ b/components/script/dom/gpurenderpipeline.rs @@ -91,7 +91,7 @@ impl GPURenderPipeline { } } -impl GPURenderPipelineMethods for GPURenderPipeline { +impl GPURenderPipelineMethods<crate::DomTypeHolder> for GPURenderPipeline { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpusampler.rs b/components/script/dom/gpusampler.rs index e79ea6af591..ad7aa3e8b89 100644 --- a/components/script/dom/gpusampler.rs +++ b/components/script/dom/gpusampler.rs @@ -118,7 +118,7 @@ impl GPUSampler { } } -impl GPUSamplerMethods for GPUSampler { +impl GPUSamplerMethods<crate::DomTypeHolder> for GPUSampler { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpushadermodule.rs b/components/script/dom/gpushadermodule.rs index f08c91e32bb..4febc758637 100644 --- a/components/script/dom/gpushadermodule.rs +++ b/components/script/dom/gpushadermodule.rs @@ -109,7 +109,7 @@ impl GPUShaderModule { } } -impl GPUShaderModuleMethods for GPUShaderModule { +impl GPUShaderModuleMethods<crate::DomTypeHolder> for GPUShaderModule { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpusupportedfeatures.rs b/components/script/dom/gpusupportedfeatures.rs index cafa8d87908..797b2635925 100644 --- a/components/script/dom/gpusupportedfeatures.rs +++ b/components/script/dom/gpusupportedfeatures.rs @@ -125,7 +125,7 @@ impl GPUSupportedFeatures { } } -impl GPUSupportedFeaturesMethods for GPUSupportedFeatures { +impl GPUSupportedFeaturesMethods<crate::DomTypeHolder> for GPUSupportedFeatures { fn Size(&self) -> u32 { self.internal.size() } diff --git a/components/script/dom/gpusupportedlimits.rs b/components/script/dom/gpusupportedlimits.rs index f86dd5aaf20..bbad05face0 100644 --- a/components/script/dom/gpusupportedlimits.rs +++ b/components/script/dom/gpusupportedlimits.rs @@ -34,7 +34,7 @@ impl GPUSupportedLimits { } } -impl GPUSupportedLimitsMethods for GPUSupportedLimits { +impl GPUSupportedLimitsMethods<crate::DomTypeHolder> for GPUSupportedLimits { /// <https://gpuweb.github.io/gpuweb/#dom-gpusupportedlimits-maxtexturedimension1d> fn MaxTextureDimension1D(&self) -> u32 { self.limits.max_texture_dimension_1d diff --git a/components/script/dom/gputexture.rs b/components/script/dom/gputexture.rs index 530af51666d..50913734ad5 100644 --- a/components/script/dom/gputexture.rs +++ b/components/script/dom/gputexture.rs @@ -160,7 +160,7 @@ impl GPUTexture { } } -impl GPUTextureMethods for GPUTexture { +impl GPUTextureMethods<crate::DomTypeHolder> for GPUTexture { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gputextureview.rs b/components/script/dom/gputextureview.rs index b7e703d670a..3c8d484fca3 100644 --- a/components/script/dom/gputextureview.rs +++ b/components/script/dom/gputextureview.rs @@ -66,7 +66,7 @@ impl GPUTextureView { } } -impl GPUTextureViewMethods for GPUTextureView { +impl GPUTextureViewMethods<crate::DomTypeHolder> for GPUTextureView { /// <https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/gpuuncapturederrorevent.rs b/components/script/dom/gpuuncapturederrorevent.rs index 262c8207d7e..0ee3871d98d 100644 --- a/components/script/dom/gpuuncapturederrorevent.rs +++ b/components/script/dom/gpuuncapturederrorevent.rs @@ -68,7 +68,7 @@ impl GPUUncapturedErrorEvent { } } -impl GPUUncapturedErrorEventMethods for GPUUncapturedErrorEvent { +impl GPUUncapturedErrorEventMethods<crate::DomTypeHolder> for GPUUncapturedErrorEvent { /// <https://gpuweb.github.io/gpuweb/#dom-gpuuncapturederrorevent-gpuuncapturederrorevent> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/gpuvalidationerror.rs b/components/script/dom/gpuvalidationerror.rs index b02623134ff..f29e5bc4e5b 100644 --- a/components/script/dom/gpuvalidationerror.rs +++ b/components/script/dom/gpuvalidationerror.rs @@ -40,7 +40,7 @@ impl GPUValidationError { } } -impl GPUValidationErrorMethods for GPUValidationError { +impl GPUValidationErrorMethods<crate::DomTypeHolder> for GPUValidationError { /// <https://gpuweb.github.io/gpuweb/#dom-gpuvalidationerror-gpuvalidationerror> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/hashchangeevent.rs b/components/script/dom/hashchangeevent.rs index e39ede9870b..001eb6497cf 100644 --- a/components/script/dom/hashchangeevent.rs +++ b/components/script/dom/hashchangeevent.rs @@ -91,7 +91,7 @@ impl HashChangeEvent { } } -impl HashChangeEventMethods for HashChangeEvent { +impl HashChangeEventMethods<crate::DomTypeHolder> for HashChangeEvent { // https://html.spec.whatwg.org/multipage/#hashchangeevent fn Constructor( window: &Window, diff --git a/components/script/dom/headers.rs b/components/script/dom/headers.rs index 3bc50df5ce5..65e82393274 100644 --- a/components/script/dom/headers.rs +++ b/components/script/dom/headers.rs @@ -65,7 +65,7 @@ impl Headers { } } -impl HeadersMethods for Headers { +impl HeadersMethods<crate::DomTypeHolder> for Headers { // https://fetch.spec.whatwg.org/#dom-headers fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/history.rs b/components/script/dom/history.rs index 039bf15d5ed..fb082acd9d7 100644 --- a/components/script/dom/history.rs +++ b/components/script/dom/history.rs @@ -287,7 +287,7 @@ impl History { } } -impl HistoryMethods for History { +impl HistoryMethods<crate::DomTypeHolder> for History { /// <https://html.spec.whatwg.org/multipage/#dom-history-state> fn GetState(&self, _cx: JSContext, mut retval: MutableHandleValue) -> Fallible<()> { if !self.window.Document().is_fully_active() { diff --git a/components/script/dom/htmlanchorelement.rs b/components/script/dom/htmlanchorelement.rs index bf0db257134..afdfa7bb68d 100644 --- a/components/script/dom/htmlanchorelement.rs +++ b/components/script/dom/htmlanchorelement.rs @@ -160,7 +160,7 @@ impl VirtualMethods for HTMLAnchorElement { } } -impl HTMLAnchorElementMethods for HTMLAnchorElement { +impl HTMLAnchorElementMethods<crate::DomTypeHolder> for HTMLAnchorElement { // https://html.spec.whatwg.org/multipage/#dom-a-text fn Text(&self) -> DOMString { self.upcast::<Node>().GetTextContent().unwrap() diff --git a/components/script/dom/htmlareaelement.rs b/components/script/dom/htmlareaelement.rs index f42a769a18e..0586b0875d7 100644 --- a/components/script/dom/htmlareaelement.rs +++ b/components/script/dom/htmlareaelement.rs @@ -332,7 +332,7 @@ impl VirtualMethods for HTMLAreaElement { } } -impl HTMLAreaElementMethods for HTMLAreaElement { +impl HTMLAreaElementMethods<crate::DomTypeHolder> for HTMLAreaElement { // https://html.spec.whatwg.org/multipage/#attr-hyperlink-target make_getter!(Target, "target"); diff --git a/components/script/dom/htmlaudioelement.rs b/components/script/dom/htmlaudioelement.rs index b9140f9c2d3..288782550c2 100644 --- a/components/script/dom/htmlaudioelement.rs +++ b/components/script/dom/htmlaudioelement.rs @@ -55,7 +55,7 @@ impl HTMLAudioElement { } } -impl HTMLAudioElementMethods for HTMLAudioElement { +impl HTMLAudioElementMethods<crate::DomTypeHolder> for HTMLAudioElement { // https://html.spec.whatwg.org/multipage/#dom-audio fn Audio( window: &Window, diff --git a/components/script/dom/htmlbaseelement.rs b/components/script/dom/htmlbaseelement.rs index e87d8b58fc5..9618eebacd1 100644 --- a/components/script/dom/htmlbaseelement.rs +++ b/components/script/dom/htmlbaseelement.rs @@ -80,7 +80,7 @@ impl HTMLBaseElement { } } -impl HTMLBaseElementMethods for HTMLBaseElement { +impl HTMLBaseElementMethods<crate::DomTypeHolder> for HTMLBaseElement { // https://html.spec.whatwg.org/multipage/#dom-base-href fn Href(&self) -> DOMString { // Step 1. diff --git a/components/script/dom/htmlbodyelement.rs b/components/script/dom/htmlbodyelement.rs index e85eb407900..5bb650973c7 100644 --- a/components/script/dom/htmlbodyelement.rs +++ b/components/script/dom/htmlbodyelement.rs @@ -73,7 +73,7 @@ impl HTMLBodyElement { } } -impl HTMLBodyElementMethods for HTMLBodyElement { +impl HTMLBodyElementMethods<crate::DomTypeHolder> for HTMLBodyElement { // https://html.spec.whatwg.org/multipage/#dom-body-bgcolor make_getter!(BgColor, "bgcolor"); diff --git a/components/script/dom/htmlbuttonelement.rs b/components/script/dom/htmlbuttonelement.rs index 0fc017a1707..75e8be38b17 100644 --- a/components/script/dom/htmlbuttonelement.rs +++ b/components/script/dom/htmlbuttonelement.rs @@ -93,7 +93,7 @@ impl HTMLButtonElement { } } -impl HTMLButtonElementMethods for HTMLButtonElement { +impl HTMLButtonElementMethods<crate::DomTypeHolder> for HTMLButtonElement { // https://html.spec.whatwg.org/multipage/#dom-fe-disabled make_bool_getter!(Disabled, "disabled"); diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index bb3109771f9..ed49a742614 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -339,7 +339,7 @@ impl HTMLCanvasElement { } } -impl HTMLCanvasElementMethods for HTMLCanvasElement { +impl HTMLCanvasElementMethods<crate::DomTypeHolder> for HTMLCanvasElement { // https://html.spec.whatwg.org/multipage/#dom-canvas-width make_uint_getter!(Width, "width", DEFAULT_WIDTH); diff --git a/components/script/dom/htmlcollection.rs b/components/script/dom/htmlcollection.rs index 0dc1eae0a12..dc95d644d16 100644 --- a/components/script/dom/htmlcollection.rs +++ b/components/script/dom/htmlcollection.rs @@ -315,7 +315,7 @@ impl HTMLCollection { } } -impl HTMLCollectionMethods for HTMLCollection { +impl HTMLCollectionMethods<crate::DomTypeHolder> for HTMLCollection { /// <https://dom.spec.whatwg.org/#dom-htmlcollection-length> fn Length(&self) -> u32 { self.validate_cache(); diff --git a/components/script/dom/htmldataelement.rs b/components/script/dom/htmldataelement.rs index c393ef376c3..5aadd1c8e3a 100644 --- a/components/script/dom/htmldataelement.rs +++ b/components/script/dom/htmldataelement.rs @@ -47,7 +47,7 @@ impl HTMLDataElement { } } -impl HTMLDataElementMethods for HTMLDataElement { +impl HTMLDataElementMethods<crate::DomTypeHolder> for HTMLDataElement { // https://html.spec.whatwg.org/multipage/#dom-data-value make_getter!(Value, "value"); diff --git a/components/script/dom/htmldatalistelement.rs b/components/script/dom/htmldatalistelement.rs index 3a5947e218a..e27d6aa969c 100644 --- a/components/script/dom/htmldatalistelement.rs +++ b/components/script/dom/htmldatalistelement.rs @@ -52,7 +52,7 @@ impl HTMLDataListElement { } } -impl HTMLDataListElementMethods for HTMLDataListElement { +impl HTMLDataListElementMethods<crate::DomTypeHolder> for HTMLDataListElement { // https://html.spec.whatwg.org/multipage/#dom-datalist-options fn Options(&self) -> DomRoot<HTMLCollection> { #[derive(JSTraceable, MallocSizeOf)] diff --git a/components/script/dom/htmldetailselement.rs b/components/script/dom/htmldetailselement.rs index a1086a86515..44a8a8fe63a 100644 --- a/components/script/dom/htmldetailselement.rs +++ b/components/script/dom/htmldetailselement.rs @@ -63,7 +63,7 @@ impl HTMLDetailsElement { } } -impl HTMLDetailsElementMethods for HTMLDetailsElement { +impl HTMLDetailsElementMethods<crate::DomTypeHolder> for HTMLDetailsElement { // https://html.spec.whatwg.org/multipage/#dom-details-open make_bool_getter!(Open, "open"); diff --git a/components/script/dom/htmldialogelement.rs b/components/script/dom/htmldialogelement.rs index ee52cbfb814..860072566d7 100644 --- a/components/script/dom/htmldialogelement.rs +++ b/components/script/dom/htmldialogelement.rs @@ -55,7 +55,7 @@ impl HTMLDialogElement { } } -impl HTMLDialogElementMethods for HTMLDialogElement { +impl HTMLDialogElementMethods<crate::DomTypeHolder> for HTMLDialogElement { // https://html.spec.whatwg.org/multipage/#dom-dialog-open make_bool_getter!(Open, "open"); diff --git a/components/script/dom/htmldivelement.rs b/components/script/dom/htmldivelement.rs index bc028c1d09d..4bb69f863d2 100644 --- a/components/script/dom/htmldivelement.rs +++ b/components/script/dom/htmldivelement.rs @@ -47,7 +47,7 @@ impl HTMLDivElement { } } -impl HTMLDivElementMethods for HTMLDivElement { +impl HTMLDivElementMethods<crate::DomTypeHolder> for HTMLDivElement { // https://html.spec.whatwg.org/multipage/#dom-div-align make_getter!(Align, "align"); diff --git a/components/script/dom/htmlelement.rs b/components/script/dom/htmlelement.rs index 697e5833a42..5f96e38851f 100644 --- a/components/script/dom/htmlelement.rs +++ b/components/script/dom/htmlelement.rs @@ -135,7 +135,7 @@ impl HTMLElement { } } -impl HTMLElementMethods for HTMLElement { +impl HTMLElementMethods<crate::DomTypeHolder> for HTMLElement { // https://html.spec.whatwg.org/multipage/#the-style-attribute fn Style(&self) -> DomRoot<CSSStyleDeclaration> { self.style_decl.or_init(|| { diff --git a/components/script/dom/htmlfieldsetelement.rs b/components/script/dom/htmlfieldsetelement.rs index b0a253e869b..d6f4f95fe6b 100644 --- a/components/script/dom/htmlfieldsetelement.rs +++ b/components/script/dom/htmlfieldsetelement.rs @@ -85,7 +85,7 @@ impl HTMLFieldSetElement { } } -impl HTMLFieldSetElementMethods for HTMLFieldSetElement { +impl HTMLFieldSetElementMethods<crate::DomTypeHolder> for HTMLFieldSetElement { // https://html.spec.whatwg.org/multipage/#dom-fieldset-elements fn Elements(&self) -> DomRoot<HTMLCollection> { #[derive(JSTraceable, MallocSizeOf)] diff --git a/components/script/dom/htmlfontelement.rs b/components/script/dom/htmlfontelement.rs index 13d9cd41307..b670ff4971f 100644 --- a/components/script/dom/htmlfontelement.rs +++ b/components/script/dom/htmlfontelement.rs @@ -90,7 +90,7 @@ impl HTMLFontElement { } } -impl HTMLFontElementMethods for HTMLFontElement { +impl HTMLFontElementMethods<crate::DomTypeHolder> for HTMLFontElement { // https://html.spec.whatwg.org/multipage/#dom-font-color make_getter!(Color, "color"); diff --git a/components/script/dom/htmlformcontrolscollection.rs b/components/script/dom/htmlformcontrolscollection.rs index 271eb204150..4c037fd0632 100644 --- a/components/script/dom/htmlformcontrolscollection.rs +++ b/components/script/dom/htmlformcontrolscollection.rs @@ -52,7 +52,7 @@ impl HTMLFormControlsCollection { } } -impl HTMLFormControlsCollectionMethods for HTMLFormControlsCollection { +impl HTMLFormControlsCollectionMethods<crate::DomTypeHolder> for HTMLFormControlsCollection { // FIXME: This shouldn't need to be implemented here since HTMLCollection (the parent of // HTMLFormControlsCollection) implements Length // https://dom.spec.whatwg.org/#dom-htmlcollection-length diff --git a/components/script/dom/htmlformelement.rs b/components/script/dom/htmlformelement.rs index 3be435edcff..4fe3785d470 100644 --- a/components/script/dom/htmlformelement.rs +++ b/components/script/dom/htmlformelement.rs @@ -203,7 +203,7 @@ impl HTMLFormElement { } } -impl HTMLFormElementMethods for HTMLFormElement { +impl HTMLFormElementMethods<crate::DomTypeHolder> for HTMLFormElement { // https://html.spec.whatwg.org/multipage/#dom-form-acceptcharset make_getter!(AcceptCharset, "accept-charset"); diff --git a/components/script/dom/htmlframesetelement.rs b/components/script/dom/htmlframesetelement.rs index 37e81ff2f0a..c7d401411f7 100644 --- a/components/script/dom/htmlframesetelement.rs +++ b/components/script/dom/htmlframesetelement.rs @@ -52,7 +52,7 @@ impl HTMLFrameSetElement { } } -impl HTMLFrameSetElementMethods for HTMLFrameSetElement { +impl HTMLFrameSetElementMethods<crate::DomTypeHolder> for HTMLFrameSetElement { // https://html.spec.whatwg.org/multipage/#windoweventhandlers window_event_handlers!(ForwardToWindow); } diff --git a/components/script/dom/htmlhrelement.rs b/components/script/dom/htmlhrelement.rs index 24f86f94674..bf9cf8e79a0 100644 --- a/components/script/dom/htmlhrelement.rs +++ b/components/script/dom/htmlhrelement.rs @@ -52,7 +52,7 @@ impl HTMLHRElement { } } -impl HTMLHRElementMethods for HTMLHRElement { +impl HTMLHRElementMethods<crate::DomTypeHolder> for HTMLHRElement { // https://html.spec.whatwg.org/multipage/#dom-hr-align make_getter!(Align, "align"); diff --git a/components/script/dom/htmliframeelement.rs b/components/script/dom/htmliframeelement.rs index d26cf6297f2..f6d555da1ad 100644 --- a/components/script/dom/htmliframeelement.rs +++ b/components/script/dom/htmliframeelement.rs @@ -549,7 +549,7 @@ impl HTMLIFrameElementLayoutMethods for LayoutDom<'_, HTMLIFrameElement> { } } -impl HTMLIFrameElementMethods for HTMLIFrameElement { +impl HTMLIFrameElementMethods<crate::DomTypeHolder> for HTMLIFrameElement { // https://html.spec.whatwg.org/multipage/#dom-iframe-src make_url_getter!(Src, "src"); diff --git a/components/script/dom/htmlimageelement.rs b/components/script/dom/htmlimageelement.rs index 61f4400a554..2bb1277c987 100644 --- a/components/script/dom/htmlimageelement.rs +++ b/components/script/dom/htmlimageelement.rs @@ -1534,7 +1534,7 @@ fn get_correct_referrerpolicy_from_raw_token(token: &DOMString) -> DOMString { } #[allow(non_snake_case)] -impl HTMLImageElementMethods for HTMLImageElement { +impl HTMLImageElementMethods<crate::DomTypeHolder> for HTMLImageElement { // https://html.spec.whatwg.org/multipage/#dom-image fn Image( window: &Window, diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 08aacca46e1..5eae0866e1a 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -1131,7 +1131,7 @@ impl TextControlElement for HTMLInputElement { } #[allow(non_snake_case)] -impl HTMLInputElementMethods for HTMLInputElement { +impl HTMLInputElementMethods<crate::DomTypeHolder> for HTMLInputElement { // https://html.spec.whatwg.org/multipage/#dom-input-accept make_getter!(Accept, "accept"); diff --git a/components/script/dom/htmllabelelement.rs b/components/script/dom/htmllabelelement.rs index 9fc8b3eb2f2..c1f7a4d663c 100644 --- a/components/script/dom/htmllabelelement.rs +++ b/components/script/dom/htmllabelelement.rs @@ -83,7 +83,7 @@ impl Activatable for HTMLLabelElement { } } -impl HTMLLabelElementMethods for HTMLLabelElement { +impl HTMLLabelElementMethods<crate::DomTypeHolder> for HTMLLabelElement { // https://html.spec.whatwg.org/multipage/#dom-fae-form fn GetForm(&self) -> Option<DomRoot<HTMLFormElement>> { self.form_owner() diff --git a/components/script/dom/htmllegendelement.rs b/components/script/dom/htmllegendelement.rs index 8d5029b69fa..7d21ebf65cb 100644 --- a/components/script/dom/htmllegendelement.rs +++ b/components/script/dom/htmllegendelement.rs @@ -86,7 +86,7 @@ impl VirtualMethods for HTMLLegendElement { } } -impl HTMLLegendElementMethods for HTMLLegendElement { +impl HTMLLegendElementMethods<crate::DomTypeHolder> for HTMLLegendElement { // https://html.spec.whatwg.org/multipage/#dom-legend-form fn GetForm(&self) -> Option<DomRoot<HTMLFormElement>> { let parent = self.upcast::<Node>().GetParentElement()?; diff --git a/components/script/dom/htmllielement.rs b/components/script/dom/htmllielement.rs index b86db3afef1..1ce637d4089 100644 --- a/components/script/dom/htmllielement.rs +++ b/components/script/dom/htmllielement.rs @@ -50,7 +50,7 @@ impl HTMLLIElement { } } -impl HTMLLIElementMethods for HTMLLIElement { +impl HTMLLIElementMethods<crate::DomTypeHolder> for HTMLLIElement { // https://html.spec.whatwg.org/multipage/#dom-li-value make_int_getter!(Value, "value"); diff --git a/components/script/dom/htmllinkelement.rs b/components/script/dom/htmllinkelement.rs index 140471071a8..f34f508c71c 100644 --- a/components/script/dom/htmllinkelement.rs +++ b/components/script/dom/htmllinkelement.rs @@ -517,7 +517,7 @@ impl StylesheetOwner for HTMLLinkElement { } } -impl HTMLLinkElementMethods for HTMLLinkElement { +impl HTMLLinkElementMethods<crate::DomTypeHolder> for HTMLLinkElement { // https://html.spec.whatwg.org/multipage/#dom-link-href make_url_getter!(Href, "href"); diff --git a/components/script/dom/htmlmediaelement.rs b/components/script/dom/htmlmediaelement.rs index e7aa9c274e4..b30fa3d4b22 100644 --- a/components/script/dom/htmlmediaelement.rs +++ b/components/script/dom/htmlmediaelement.rs @@ -2068,7 +2068,7 @@ impl Drop for HTMLMediaElement { } } -impl HTMLMediaElementMethods for HTMLMediaElement { +impl HTMLMediaElementMethods<crate::DomTypeHolder> for HTMLMediaElement { // https://html.spec.whatwg.org/multipage/#dom-media-networkstate fn NetworkState(&self) -> u16 { self.network_state.get() as u16 diff --git a/components/script/dom/htmlmenuelement.rs b/components/script/dom/htmlmenuelement.rs index 23395728b32..292124e1b48 100644 --- a/components/script/dom/htmlmenuelement.rs +++ b/components/script/dom/htmlmenuelement.rs @@ -46,7 +46,7 @@ impl HTMLMenuElement { } } -impl HTMLMenuElementMethods for HTMLMenuElement { +impl HTMLMenuElementMethods<crate::DomTypeHolder> for HTMLMenuElement { // spec just mandates that compact reflects the content attribute, // with no other semantics. Layout could use it to // change line spacing, but nothing requires it to do so. diff --git a/components/script/dom/htmlmetaelement.rs b/components/script/dom/htmlmetaelement.rs index 3f4e6d2b53b..e3df38f9f91 100644 --- a/components/script/dom/htmlmetaelement.rs +++ b/components/script/dom/htmlmetaelement.rs @@ -224,7 +224,7 @@ impl HTMLMetaElement { } } -impl HTMLMetaElementMethods for HTMLMetaElement { +impl HTMLMetaElementMethods<crate::DomTypeHolder> for HTMLMetaElement { // https://html.spec.whatwg.org/multipage/#dom-meta-name make_getter!(Name, "name"); diff --git a/components/script/dom/htmlmeterelement.rs b/components/script/dom/htmlmeterelement.rs index d316103308c..df7ffa2c6af 100644 --- a/components/script/dom/htmlmeterelement.rs +++ b/components/script/dom/htmlmeterelement.rs @@ -58,7 +58,7 @@ impl HTMLMeterElement { } } -impl HTMLMeterElementMethods for HTMLMeterElement { +impl HTMLMeterElementMethods<crate::DomTypeHolder> for HTMLMeterElement { // https://html.spec.whatwg.org/multipage/#dom-lfe-labels make_labels_getter!(Labels, labels_node_list); diff --git a/components/script/dom/htmlobjectelement.rs b/components/script/dom/htmlobjectelement.rs index e0cea43155b..591a330ad40 100644 --- a/components/script/dom/htmlobjectelement.rs +++ b/components/script/dom/htmlobjectelement.rs @@ -89,7 +89,7 @@ impl<'a> ProcessDataURL for &'a HTMLObjectElement { } } -impl HTMLObjectElementMethods for HTMLObjectElement { +impl HTMLObjectElementMethods<crate::DomTypeHolder> for HTMLObjectElement { // https://html.spec.whatwg.org/multipage/#dom-object-type make_getter!(Type, "type"); diff --git a/components/script/dom/htmloptgroupelement.rs b/components/script/dom/htmloptgroupelement.rs index d0dbd725f4c..ef5adb06f2f 100644 --- a/components/script/dom/htmloptgroupelement.rs +++ b/components/script/dom/htmloptgroupelement.rs @@ -75,7 +75,7 @@ impl HTMLOptGroupElement { } } -impl HTMLOptGroupElementMethods for HTMLOptGroupElement { +impl HTMLOptGroupElementMethods<crate::DomTypeHolder> for HTMLOptGroupElement { // https://html.spec.whatwg.org/multipage/#dom-optgroup-disabled make_bool_getter!(Disabled, "disabled"); diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index 649d35a50d8..66925d56672 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -174,7 +174,7 @@ fn collect_text(element: &Element, value: &mut String) { } } -impl HTMLOptionElementMethods for HTMLOptionElement { +impl HTMLOptionElementMethods<crate::DomTypeHolder> for HTMLOptionElement { // https://html.spec.whatwg.org/multipage/#dom-option fn Option( window: &Window, diff --git a/components/script/dom/htmloptionscollection.rs b/components/script/dom/htmloptionscollection.rs index 6c6cb0b8833..ee36ff158b3 100644 --- a/components/script/dom/htmloptionscollection.rs +++ b/components/script/dom/htmloptionscollection.rs @@ -68,7 +68,7 @@ impl HTMLOptionsCollection { } } -impl HTMLOptionsCollectionMethods for HTMLOptionsCollection { +impl HTMLOptionsCollectionMethods<crate::DomTypeHolder> for HTMLOptionsCollection { // FIXME: This shouldn't need to be implemented here since HTMLCollection (the parent of // HTMLOptionsCollection) implements NamedGetter. // https://github.com/servo/servo/issues/5875 diff --git a/components/script/dom/htmloutputelement.rs b/components/script/dom/htmloutputelement.rs index a83f28277a1..a3e4def8cc9 100644 --- a/components/script/dom/htmloutputelement.rs +++ b/components/script/dom/htmloutputelement.rs @@ -71,7 +71,7 @@ impl HTMLOutputElement { } } -impl HTMLOutputElementMethods for HTMLOutputElement { +impl HTMLOutputElementMethods<crate::DomTypeHolder> for HTMLOutputElement { // https://html.spec.whatwg.org/multipage/#dom-fae-form fn GetForm(&self) -> Option<DomRoot<HTMLFormElement>> { self.form_owner() diff --git a/components/script/dom/htmlpreelement.rs b/components/script/dom/htmlpreelement.rs index 54651c9633e..fcd152be7e5 100644 --- a/components/script/dom/htmlpreelement.rs +++ b/components/script/dom/htmlpreelement.rs @@ -66,7 +66,7 @@ impl VirtualMethods for HTMLPreElement { } } -impl HTMLPreElementMethods for HTMLPreElement { +impl HTMLPreElementMethods<crate::DomTypeHolder> for HTMLPreElement { // https://html.spec.whatwg.org/multipage/#dom-pre-width make_int_getter!(Width, "width", 0); diff --git a/components/script/dom/htmlprogresselement.rs b/components/script/dom/htmlprogresselement.rs index 8c04391b9df..5a0ee59aa6b 100644 --- a/components/script/dom/htmlprogresselement.rs +++ b/components/script/dom/htmlprogresselement.rs @@ -55,7 +55,7 @@ impl HTMLProgressElement { } } -impl HTMLProgressElementMethods for HTMLProgressElement { +impl HTMLProgressElementMethods<crate::DomTypeHolder> for HTMLProgressElement { // https://html.spec.whatwg.org/multipage/#dom-lfe-labels make_labels_getter!(Labels, labels_node_list); diff --git a/components/script/dom/htmlquoteelement.rs b/components/script/dom/htmlquoteelement.rs index 1caf6a1b46d..53ea04925d5 100644 --- a/components/script/dom/htmlquoteelement.rs +++ b/components/script/dom/htmlquoteelement.rs @@ -49,7 +49,7 @@ impl HTMLQuoteElement { } } -impl HTMLQuoteElementMethods for HTMLQuoteElement { +impl HTMLQuoteElementMethods<crate::DomTypeHolder> for HTMLQuoteElement { // https://html.spec.whatwg.org/multipage/#dom-quote-cite make_url_getter!(Cite, "cite"); diff --git a/components/script/dom/htmlscriptelement.rs b/components/script/dom/htmlscriptelement.rs index 86a803648a5..4ab12c60df1 100644 --- a/components/script/dom/htmlscriptelement.rs +++ b/components/script/dom/htmlscriptelement.rs @@ -1229,7 +1229,7 @@ impl VirtualMethods for HTMLScriptElement { } } -impl HTMLScriptElementMethods for HTMLScriptElement { +impl HTMLScriptElementMethods<crate::DomTypeHolder> for HTMLScriptElement { // https://html.spec.whatwg.org/multipage/#dom-script-src make_url_getter!(Src, "src"); diff --git a/components/script/dom/htmlselectelement.rs b/components/script/dom/htmlselectelement.rs index f8abd9188cc..ad0784b7b45 100644 --- a/components/script/dom/htmlselectelement.rs +++ b/components/script/dom/htmlselectelement.rs @@ -219,7 +219,7 @@ impl HTMLSelectElement { } } -impl HTMLSelectElementMethods for HTMLSelectElement { +impl HTMLSelectElementMethods<crate::DomTypeHolder> for HTMLSelectElement { // https://html.spec.whatwg.org/multipage/#dom-select-add fn Add( &self, diff --git a/components/script/dom/htmlsourceelement.rs b/components/script/dom/htmlsourceelement.rs index 80855156df4..886a935b0ea 100644 --- a/components/script/dom/htmlsourceelement.rs +++ b/components/script/dom/htmlsourceelement.rs @@ -115,7 +115,7 @@ impl VirtualMethods for HTMLSourceElement { } } -impl HTMLSourceElementMethods for HTMLSourceElement { +impl HTMLSourceElementMethods<crate::DomTypeHolder> for HTMLSourceElement { // https://html.spec.whatwg.org/multipage/#dom-source-src make_getter!(Src, "src"); diff --git a/components/script/dom/htmlstyleelement.rs b/components/script/dom/htmlstyleelement.rs index 5f93eba9044..3c228f45586 100644 --- a/components/script/dom/htmlstyleelement.rs +++ b/components/script/dom/htmlstyleelement.rs @@ -277,7 +277,7 @@ impl StylesheetOwner for HTMLStyleElement { } } -impl HTMLStyleElementMethods for HTMLStyleElement { +impl HTMLStyleElementMethods<crate::DomTypeHolder> for HTMLStyleElement { /// <https://drafts.csswg.org/cssom/#dom-linkstyle-sheet> fn GetSheet(&self) -> Option<DomRoot<DOMStyleSheet>> { self.get_cssom_stylesheet().map(DomRoot::upcast) diff --git a/components/script/dom/htmltablecellelement.rs b/components/script/dom/htmltablecellelement.rs index 50f4b20cb38..4a5b125f3ea 100644 --- a/components/script/dom/htmltablecellelement.rs +++ b/components/script/dom/htmltablecellelement.rs @@ -65,7 +65,7 @@ impl HTMLTableCellElement { } } -impl HTMLTableCellElementMethods for HTMLTableCellElement { +impl HTMLTableCellElementMethods<crate::DomTypeHolder> for HTMLTableCellElement { // https://html.spec.whatwg.org/multipage/#dom-tdth-colspan make_uint_getter!(ColSpan, "colspan", DEFAULT_COLSPAN); diff --git a/components/script/dom/htmltablecolelement.rs b/components/script/dom/htmltablecolelement.rs index 522b6eaf934..bdcd083d296 100644 --- a/components/script/dom/htmltablecolelement.rs +++ b/components/script/dom/htmltablecolelement.rs @@ -60,7 +60,7 @@ impl HTMLTableColElement { } } -impl HTMLTableColElementMethods for HTMLTableColElement { +impl HTMLTableColElementMethods<crate::DomTypeHolder> for HTMLTableColElement { // <https://html.spec.whatwg.org/multipage/#attr-col-span> make_uint_getter!(Span, "span", DEFAULT_SPAN); // <https://html.spec.whatwg.org/multipage/#attr-col-span> diff --git a/components/script/dom/htmltableelement.rs b/components/script/dom/htmltableelement.rs index 1d17116a6d5..b4b3fceed9d 100644 --- a/components/script/dom/htmltableelement.rs +++ b/components/script/dom/htmltableelement.rs @@ -188,7 +188,7 @@ impl HTMLTableElement { } } -impl HTMLTableElementMethods for HTMLTableElement { +impl HTMLTableElementMethods<crate::DomTypeHolder> for HTMLTableElement { // https://html.spec.whatwg.org/multipage/#dom-table-rows fn Rows(&self) -> DomRoot<HTMLCollection> { let filter = self.get_rows(); diff --git a/components/script/dom/htmltablerowelement.rs b/components/script/dom/htmltablerowelement.rs index 101182cff57..790dce4dd73 100644 --- a/components/script/dom/htmltablerowelement.rs +++ b/components/script/dom/htmltablerowelement.rs @@ -85,7 +85,7 @@ impl HTMLTableRowElement { } } -impl HTMLTableRowElementMethods for HTMLTableRowElement { +impl HTMLTableRowElementMethods<crate::DomTypeHolder> for HTMLTableRowElement { // https://html.spec.whatwg.org/multipage/#dom-tr-bgcolor make_getter!(BgColor, "bgcolor"); diff --git a/components/script/dom/htmltablesectionelement.rs b/components/script/dom/htmltablesectionelement.rs index 37669bfa8a6..de6803ead41 100644 --- a/components/script/dom/htmltablesectionelement.rs +++ b/components/script/dom/htmltablesectionelement.rs @@ -70,7 +70,7 @@ impl CollectionFilter for RowsFilter { } } -impl HTMLTableSectionElementMethods for HTMLTableSectionElement { +impl HTMLTableSectionElementMethods<crate::DomTypeHolder> for HTMLTableSectionElement { // https://html.spec.whatwg.org/multipage/#dom-tbody-rows fn Rows(&self) -> DomRoot<HTMLCollection> { HTMLCollection::create(&window_from_node(self), self.upcast(), Box::new(RowsFilter)) diff --git a/components/script/dom/htmltemplateelement.rs b/components/script/dom/htmltemplateelement.rs index 4e3432070fd..ce83c8b2efe 100644 --- a/components/script/dom/htmltemplateelement.rs +++ b/components/script/dom/htmltemplateelement.rs @@ -60,7 +60,7 @@ impl HTMLTemplateElement { } } -impl HTMLTemplateElementMethods for HTMLTemplateElement { +impl HTMLTemplateElementMethods<crate::DomTypeHolder> for HTMLTemplateElement { /// <https://html.spec.whatwg.org/multipage/#dom-template-content> fn Content(&self, can_gc: CanGc) -> DomRoot<DocumentFragment> { self.contents.or_init(|| { diff --git a/components/script/dom/htmltextareaelement.rs b/components/script/dom/htmltextareaelement.rs index 49e0cd204d5..cfdca55e527 100644 --- a/components/script/dom/htmltextareaelement.rs +++ b/components/script/dom/htmltextareaelement.rs @@ -222,7 +222,7 @@ impl TextControlElement for HTMLTextAreaElement { } } -impl HTMLTextAreaElementMethods for HTMLTextAreaElement { +impl HTMLTextAreaElementMethods<crate::DomTypeHolder> for HTMLTextAreaElement { // TODO A few of these attributes have default values and additional // constraints diff --git a/components/script/dom/htmltimeelement.rs b/components/script/dom/htmltimeelement.rs index 7b3046338aa..c54527548b4 100644 --- a/components/script/dom/htmltimeelement.rs +++ b/components/script/dom/htmltimeelement.rs @@ -47,7 +47,7 @@ impl HTMLTimeElement { } } -impl HTMLTimeElementMethods for HTMLTimeElement { +impl HTMLTimeElementMethods<crate::DomTypeHolder> for HTMLTimeElement { // https://html.spec.whatwg.org/multipage/#dom-time-datetime make_getter!(DateTime, "datetime"); diff --git a/components/script/dom/htmltitleelement.rs b/components/script/dom/htmltitleelement.rs index e67720efe83..29efcad052c 100644 --- a/components/script/dom/htmltitleelement.rs +++ b/components/script/dom/htmltitleelement.rs @@ -63,7 +63,7 @@ impl HTMLTitleElement { } } -impl HTMLTitleElementMethods for HTMLTitleElement { +impl HTMLTitleElementMethods<crate::DomTypeHolder> for HTMLTitleElement { // https://html.spec.whatwg.org/multipage/#dom-title-text fn Text(&self) -> DOMString { self.upcast::<Node>().child_text_content() diff --git a/components/script/dom/htmltrackelement.rs b/components/script/dom/htmltrackelement.rs index 7f0889a01e5..f530753858f 100644 --- a/components/script/dom/htmltrackelement.rs +++ b/components/script/dom/htmltrackelement.rs @@ -77,7 +77,7 @@ impl HTMLTrackElement { } } -impl HTMLTrackElementMethods for HTMLTrackElement { +impl HTMLTrackElementMethods<crate::DomTypeHolder> for HTMLTrackElement { // https://html.spec.whatwg.org/multipage/#dom-track-kind fn Kind(&self) -> DOMString { let element = self.upcast::<Element>(); diff --git a/components/script/dom/htmlulistelement.rs b/components/script/dom/htmlulistelement.rs index a90fa85efb8..e462d66963e 100644 --- a/components/script/dom/htmlulistelement.rs +++ b/components/script/dom/htmlulistelement.rs @@ -49,7 +49,7 @@ impl HTMLUListElement { } } -impl HTMLUListElementMethods for HTMLUListElement { +impl HTMLUListElementMethods<crate::DomTypeHolder> for HTMLUListElement { // https://html.spec.whatwg.org/multipage/#dom-ul-compact make_bool_getter!(Compact, "compact"); diff --git a/components/script/dom/htmlvideoelement.rs b/components/script/dom/htmlvideoelement.rs index 58981651a0e..77a00c1d481 100644 --- a/components/script/dom/htmlvideoelement.rs +++ b/components/script/dom/htmlvideoelement.rs @@ -240,7 +240,7 @@ impl HTMLVideoElement { } } -impl HTMLVideoElementMethods for HTMLVideoElement { +impl HTMLVideoElementMethods<crate::DomTypeHolder> for HTMLVideoElement { // https://html.spec.whatwg.org/multipage/#dom-video-videowidth fn VideoWidth(&self) -> u32 { if self.htmlmediaelement.get_ready_state() == ReadyState::HaveNothing { diff --git a/components/script/dom/iirfilternode.rs b/components/script/dom/iirfilternode.rs index 7870c07995b..8e6d4fd8d11 100644 --- a/components/script/dom/iirfilternode.rs +++ b/components/script/dom/iirfilternode.rs @@ -95,7 +95,7 @@ impl IIRFilterNode { } } -impl IIRFilterNodeMethods for IIRFilterNode { +impl IIRFilterNodeMethods<crate::DomTypeHolder> for IIRFilterNode { /// <https://webaudio.github.io/web-audio-api/#dom-iirfilternode-iirfilternode> fn Constructor( window: &Window, diff --git a/components/script/dom/imagebitmap.rs b/components/script/dom/imagebitmap.rs index 66294cbf05c..9215b889c04 100644 --- a/components/script/dom/imagebitmap.rs +++ b/components/script/dom/imagebitmap.rs @@ -61,7 +61,7 @@ impl ImageBitmap { } } -impl ImageBitmapMethods for ImageBitmap { +impl ImageBitmapMethods<crate::DomTypeHolder> for ImageBitmap { /// <https://html.spec.whatwg.org/multipage/#dom-imagebitmap-height> fn Height(&self) -> u32 { // Step 1. If this's [[Detached]] internal slot's value is true, then return 0. diff --git a/components/script/dom/imagedata.rs b/components/script/dom/imagedata.rs index 22b67650072..4fff85d8b91 100644 --- a/components/script/dom/imagedata.rs +++ b/components/script/dom/imagedata.rs @@ -172,7 +172,7 @@ impl ImageData { } } -impl ImageDataMethods for ImageData { +impl ImageDataMethods<crate::DomTypeHolder> for ImageData { /// <https://html.spec.whatwg.org/multipage/#pixel-manipulation:dom-imagedata-3> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/inputevent.rs b/components/script/dom/inputevent.rs index 5d658fe4eb6..1ba7a593b5c 100644 --- a/components/script/dom/inputevent.rs +++ b/components/script/dom/inputevent.rs @@ -52,7 +52,7 @@ impl InputEvent { } } -impl InputEventMethods for InputEvent { +impl InputEventMethods<crate::DomTypeHolder> for InputEvent { // https://w3c.github.io/uievents/#dom-inputevent-inputevent fn Constructor( window: &Window, diff --git a/components/script/dom/intersectionobserver.rs b/components/script/dom/intersectionobserver.rs index 7b926e4909a..e6d2033e808 100644 --- a/components/script/dom/intersectionobserver.rs +++ b/components/script/dom/intersectionobserver.rs @@ -59,7 +59,7 @@ impl IntersectionObserver { } } -impl IntersectionObserverMethods for IntersectionObserver { +impl IntersectionObserverMethods<crate::DomTypeHolder> for IntersectionObserver { /// > The root provided to the IntersectionObserver constructor, or null if none was provided. /// /// <https://w3c.github.io/IntersectionObserver/#dom-intersectionobserver-root> diff --git a/components/script/dom/intersectionobserverentry.rs b/components/script/dom/intersectionobserverentry.rs index 08048c779fd..f612902a2be 100644 --- a/components/script/dom/intersectionobserverentry.rs +++ b/components/script/dom/intersectionobserverentry.rs @@ -44,7 +44,7 @@ impl IntersectionObserverEntry { } } -impl IntersectionObserverEntryMethods for IntersectionObserverEntry { +impl IntersectionObserverEntryMethods<crate::DomTypeHolder> for IntersectionObserverEntry { /// > The attribute must return a DOMHighResTimeStamp that corresponds to the time the /// > intersection was recorded, relative to the time origin of the global object /// > associated with the IntersectionObserver instance that generated the notification. diff --git a/components/script/dom/keyboardevent.rs b/components/script/dom/keyboardevent.rs index f8454a54905..586fa715b6a 100644 --- a/components/script/dom/keyboardevent.rs +++ b/components/script/dom/keyboardevent.rs @@ -158,7 +158,7 @@ impl KeyboardEvent { } } -impl KeyboardEventMethods for KeyboardEvent { +impl KeyboardEventMethods<crate::DomTypeHolder> for KeyboardEvent { /// <https://w3c.github.io/uievents/#dom-keyboardevent-keyboardevent> fn Constructor( window: &Window, diff --git a/components/script/dom/location.rs b/components/script/dom/location.rs index d8a2e1081ee..d83e8549bfe 100644 --- a/components/script/dom/location.rs +++ b/components/script/dom/location.rs @@ -262,7 +262,7 @@ impl Location { } } -impl LocationMethods for Location { +impl LocationMethods<crate::DomTypeHolder> for Location { // https://html.spec.whatwg.org/multipage/#dom-location-assign fn Assign(&self, url: USVString, can_gc: CanGc) -> ErrorResult { self.setter_common( diff --git a/components/script/dom/mediadeviceinfo.rs b/components/script/dom/mediadeviceinfo.rs index cfacd7c6271..3f45f06c95f 100644 --- a/components/script/dom/mediadeviceinfo.rs +++ b/components/script/dom/mediadeviceinfo.rs @@ -54,7 +54,7 @@ impl MediaDeviceInfo { } } -impl MediaDeviceInfoMethods for MediaDeviceInfo { +impl MediaDeviceInfoMethods<crate::DomTypeHolder> for MediaDeviceInfo { /// <https://w3c.github.io/mediacapture-main/#dom-mediadeviceinfo-deviceid> fn DeviceId(&self) -> DOMString { self.device_id.clone() diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs index 985f0ee9409..8c2283e3425 100644 --- a/components/script/dom/mediadevices.rs +++ b/components/script/dom/mediadevices.rs @@ -44,7 +44,7 @@ impl MediaDevices { } } -impl MediaDevicesMethods for MediaDevices { +impl MediaDevicesMethods<crate::DomTypeHolder> for MediaDevices { /// <https://w3c.github.io/mediacapture-main/#dom-mediadevices-getusermedia> #[allow(unsafe_code)] fn GetUserMedia( diff --git a/components/script/dom/mediaelementaudiosourcenode.rs b/components/script/dom/mediaelementaudiosourcenode.rs index 007846bec29..f0d1de62a0f 100644 --- a/components/script/dom/mediaelementaudiosourcenode.rs +++ b/components/script/dom/mediaelementaudiosourcenode.rs @@ -81,7 +81,7 @@ impl MediaElementAudioSourceNode { } } -impl MediaElementAudioSourceNodeMethods for MediaElementAudioSourceNode { +impl MediaElementAudioSourceNodeMethods<crate::DomTypeHolder> for MediaElementAudioSourceNode { /// <https://webaudio.github.io/web-audio-api/#dom-mediaelementaudiosourcenode-mediaelementaudiosourcenode> fn Constructor( window: &Window, diff --git a/components/script/dom/mediaerror.rs b/components/script/dom/mediaerror.rs index 5fe5811a5ae..e527d5e1456 100644 --- a/components/script/dom/mediaerror.rs +++ b/components/script/dom/mediaerror.rs @@ -29,7 +29,7 @@ impl MediaError { } } -impl MediaErrorMethods for MediaError { +impl MediaErrorMethods<crate::DomTypeHolder> for MediaError { // https://html.spec.whatwg.org/multipage/#dom-mediaerror-code fn Code(&self) -> u16 { self.code diff --git a/components/script/dom/medialist.rs b/components/script/dom/medialist.rs index 17f65bcba61..faaba530749 100644 --- a/components/script/dom/medialist.rs +++ b/components/script/dom/medialist.rs @@ -58,7 +58,7 @@ impl MediaList { } } -impl MediaListMethods for MediaList { +impl MediaListMethods<crate::DomTypeHolder> for MediaList { /// <https://drafts.csswg.org/cssom/#dom-medialist-mediatext> fn MediaText(&self) -> DOMString { let guard = self.shared_lock().read(); diff --git a/components/script/dom/mediametadata.rs b/components/script/dom/mediametadata.rs index fb642f08e32..083c6475ca3 100644 --- a/components/script/dom/mediametadata.rs +++ b/components/script/dom/mediametadata.rs @@ -64,7 +64,7 @@ impl MediaMetadata { } } -impl MediaMetadataMethods for MediaMetadata { +impl MediaMetadataMethods<crate::DomTypeHolder> for MediaMetadata { /// <https://w3c.github.io/mediasession/#dom-mediametadata-mediametadata> fn Constructor( window: &Window, diff --git a/components/script/dom/mediaquerylist.rs b/components/script/dom/mediaquerylist.rs index ca675586578..41c9acabd64 100644 --- a/components/script/dom/mediaquerylist.rs +++ b/components/script/dom/mediaquerylist.rs @@ -78,7 +78,7 @@ impl MediaQueryList { } } -impl MediaQueryListMethods for MediaQueryList { +impl MediaQueryListMethods<crate::DomTypeHolder> for MediaQueryList { // https://drafts.csswg.org/cssom-view/#dom-mediaquerylist-media fn Media(&self) -> DOMString { self.media_query_list.to_css_string().into() diff --git a/components/script/dom/mediaquerylistevent.rs b/components/script/dom/mediaquerylistevent.rs index 6e141f2c108..d810ea594d0 100644 --- a/components/script/dom/mediaquerylistevent.rs +++ b/components/script/dom/mediaquerylistevent.rs @@ -80,7 +80,7 @@ impl MediaQueryListEvent { } } -impl MediaQueryListEventMethods for MediaQueryListEvent { +impl MediaQueryListEventMethods<crate::DomTypeHolder> for MediaQueryListEvent { // https://drafts.csswg.org/cssom-view/#dom-mediaquerylistevent-mediaquerylistevent fn Constructor( window: &Window, diff --git a/components/script/dom/mediasession.rs b/components/script/dom/mediasession.rs index 760a71e57d0..bd4afd03d5a 100644 --- a/components/script/dom/mediasession.rs +++ b/components/script/dom/mediasession.rs @@ -124,7 +124,7 @@ impl MediaSession { } } -impl MediaSessionMethods for MediaSession { +impl MediaSessionMethods<crate::DomTypeHolder> for MediaSession { /// <https://w3c.github.io/mediasession/#dom-mediasession-metadata> fn GetMetadata(&self, can_gc: CanGc) -> Option<DomRoot<MediaMetadata>> { if let Some(ref metadata) = *self.metadata.borrow() { diff --git a/components/script/dom/mediastream.rs b/components/script/dom/mediastream.rs index 172bafe508c..82ae137716a 100644 --- a/components/script/dom/mediastream.rs +++ b/components/script/dom/mediastream.rs @@ -71,7 +71,7 @@ impl MediaStream { } } -impl MediaStreamMethods for MediaStream { +impl MediaStreamMethods<crate::DomTypeHolder> for MediaStream { /// <https://w3c.github.io/mediacapture-main/#dom-mediastream-constructor> fn Constructor( global: &Window, diff --git a/components/script/dom/mediastreamaudiodestinationnode.rs b/components/script/dom/mediastreamaudiodestinationnode.rs index 3c1004ab52c..068ed364870 100644 --- a/components/script/dom/mediastreamaudiodestinationnode.rs +++ b/components/script/dom/mediastreamaudiodestinationnode.rs @@ -83,7 +83,9 @@ impl MediaStreamAudioDestinationNode { } } -impl MediaStreamAudioDestinationNodeMethods for MediaStreamAudioDestinationNode { +impl MediaStreamAudioDestinationNodeMethods<crate::DomTypeHolder> + for MediaStreamAudioDestinationNode +{ /// <https://webaudio.github.io/web-audio-api/#dom-mediastreamaudiodestinationnode-mediastreamaudiodestinationnode> fn Constructor( window: &Window, diff --git a/components/script/dom/mediastreamaudiosourcenode.rs b/components/script/dom/mediastreamaudiosourcenode.rs index 3bd92f87cfa..59aa6625903 100644 --- a/components/script/dom/mediastreamaudiosourcenode.rs +++ b/components/script/dom/mediastreamaudiosourcenode.rs @@ -78,7 +78,7 @@ impl MediaStreamAudioSourceNode { } } -impl MediaStreamAudioSourceNodeMethods for MediaStreamAudioSourceNode { +impl MediaStreamAudioSourceNodeMethods<crate::DomTypeHolder> for MediaStreamAudioSourceNode { /// <https://webaudio.github.io/web-audio-api/#dom-mediastreamaudiosourcenode-mediastreamaudiosourcenode> fn Constructor( window: &Window, diff --git a/components/script/dom/mediastreamtrack.rs b/components/script/dom/mediastreamtrack.rs index 4f1d7db6838..d0429e3ed5a 100644 --- a/components/script/dom/mediastreamtrack.rs +++ b/components/script/dom/mediastreamtrack.rs @@ -50,7 +50,7 @@ impl MediaStreamTrack { } } -impl MediaStreamTrackMethods for MediaStreamTrack { +impl MediaStreamTrackMethods<crate::DomTypeHolder> for MediaStreamTrack { /// <https://w3c.github.io/mediacapture-main/#dom-mediastreamtrack-kind> fn Kind(&self) -> DOMString { match self.ty { diff --git a/components/script/dom/mediastreamtrackaudiosourcenode.rs b/components/script/dom/mediastreamtrackaudiosourcenode.rs index 2f4e30f46d6..39996f6ec12 100644 --- a/components/script/dom/mediastreamtrackaudiosourcenode.rs +++ b/components/script/dom/mediastreamtrackaudiosourcenode.rs @@ -71,7 +71,9 @@ impl MediaStreamTrackAudioSourceNode { } } -impl MediaStreamTrackAudioSourceNodeMethods for MediaStreamTrackAudioSourceNode { +impl MediaStreamTrackAudioSourceNodeMethods<crate::DomTypeHolder> + for MediaStreamTrackAudioSourceNode +{ /// <https://webaudio.github.io/web-audio-api/#dom-mediastreamtrackaudiosourcenode-mediastreamtrackaudiosourcenode> fn Constructor( window: &Window, diff --git a/components/script/dom/messagechannel.rs b/components/script/dom/messagechannel.rs index 8730e0bcea4..87149c951cb 100644 --- a/components/script/dom/messagechannel.rs +++ b/components/script/dom/messagechannel.rs @@ -56,7 +56,7 @@ impl MessageChannel { } } -impl MessageChannelMethods for MessageChannel { +impl MessageChannelMethods<crate::DomTypeHolder> for MessageChannel { /// <https://html.spec.whatwg.org/multipage/#dom-messagechannel> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/messageevent.rs b/components/script/dom/messageevent.rs index 7d2db88b4a1..c868f1c5b93 100644 --- a/components/script/dom/messageevent.rs +++ b/components/script/dom/messageevent.rs @@ -240,7 +240,7 @@ impl MessageEvent { } } -impl MessageEventMethods for MessageEvent { +impl MessageEventMethods<crate::DomTypeHolder> for MessageEvent { /// <https://html.spec.whatwg.org/multipage/#messageevent> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/messageport.rs b/components/script/dom/messageport.rs index a915d92b503..fc0ea06cada 100644 --- a/components/script/dom/messageport.rs +++ b/components/script/dom/messageport.rs @@ -269,7 +269,7 @@ impl Transferable for MessagePort { } } -impl MessagePortMethods for MessagePort { +impl MessagePortMethods<crate::DomTypeHolder> for MessagePort { /// <https://html.spec.whatwg.org/multipage/#dom-messageport-postmessage> fn PostMessage( &self, diff --git a/components/script/dom/mimetype.rs b/components/script/dom/mimetype.rs index 437f2bd4fe9..2c15982a9bf 100644 --- a/components/script/dom/mimetype.rs +++ b/components/script/dom/mimetype.rs @@ -15,7 +15,7 @@ pub struct MimeType { reflector_: Reflector, } -impl MimeTypeMethods for MimeType { +impl MimeTypeMethods<crate::DomTypeHolder> for MimeType { // https://html.spec.whatwg.org/multipage/#dom-mimetype-type fn Type(&self) -> DOMString { unreachable!() diff --git a/components/script/dom/mimetypearray.rs b/components/script/dom/mimetypearray.rs index 0495a8d187e..aa4a81438e8 100644 --- a/components/script/dom/mimetypearray.rs +++ b/components/script/dom/mimetypearray.rs @@ -28,7 +28,7 @@ impl MimeTypeArray { } } -impl MimeTypeArrayMethods for MimeTypeArray { +impl MimeTypeArrayMethods<crate::DomTypeHolder> for MimeTypeArray { // https://html.spec.whatwg.org/multipage/#dom-mimetypearray-length fn Length(&self) -> u32 { 0 diff --git a/components/script/dom/mouseevent.rs b/components/script/dom/mouseevent.rs index ceea0f5c46e..b551cca72d1 100644 --- a/components/script/dom/mouseevent.rs +++ b/components/script/dom/mouseevent.rs @@ -187,7 +187,7 @@ impl MouseEvent { } } -impl MouseEventMethods for MouseEvent { +impl MouseEventMethods<crate::DomTypeHolder> for MouseEvent { // https://w3c.github.io/uievents/#dom-mouseevent-mouseevent fn Constructor( window: &Window, diff --git a/components/script/dom/mutationobserver.rs b/components/script/dom/mutationobserver.rs index bb329588c3f..51da85a78dd 100644 --- a/components/script/dom/mutationobserver.rs +++ b/components/script/dom/mutationobserver.rs @@ -247,7 +247,7 @@ impl MutationObserver { } } -impl MutationObserverMethods for MutationObserver { +impl MutationObserverMethods<crate::DomTypeHolder> for MutationObserver { /// <https://dom.spec.whatwg.org/#dom-mutationobserver-mutationobserver> fn Constructor( global: &Window, diff --git a/components/script/dom/mutationrecord.rs b/components/script/dom/mutationrecord.rs index 15680f338bf..1b0673ed6d1 100644 --- a/components/script/dom/mutationrecord.rs +++ b/components/script/dom/mutationrecord.rs @@ -123,7 +123,7 @@ impl MutationRecord { } } -impl MutationRecordMethods for MutationRecord { +impl MutationRecordMethods<crate::DomTypeHolder> for MutationRecord { // https://dom.spec.whatwg.org/#dom-mutationrecord-type fn Type(&self) -> DOMString { self.record_type.clone() diff --git a/components/script/dom/namednodemap.rs b/components/script/dom/namednodemap.rs index 823ad044b5c..f474fae7959 100644 --- a/components/script/dom/namednodemap.rs +++ b/components/script/dom/namednodemap.rs @@ -35,7 +35,7 @@ impl NamedNodeMap { } } -impl NamedNodeMapMethods for NamedNodeMap { +impl NamedNodeMapMethods<crate::DomTypeHolder> for NamedNodeMap { // https://dom.spec.whatwg.org/#dom-namednodemap-length fn Length(&self) -> u32 { self.owner.attrs().len() as u32 diff --git a/components/script/dom/navigationpreloadmanager.rs b/components/script/dom/navigationpreloadmanager.rs index b285e1a5681..54e01fe84e7 100644 --- a/components/script/dom/navigationpreloadmanager.rs +++ b/components/script/dom/navigationpreloadmanager.rs @@ -44,7 +44,7 @@ impl NavigationPreloadManager { } } -impl NavigationPreloadManagerMethods for NavigationPreloadManager { +impl NavigationPreloadManagerMethods<crate::DomTypeHolder> for NavigationPreloadManager { // https://w3c.github.io/ServiceWorker/#navigation-preload-manager-enable fn Enable(&self, comp: InRealm, can_gc: CanGc) -> Rc<Promise> { let promise = Promise::new_in_current_realm(comp, can_gc); diff --git a/components/script/dom/navigator.rs b/components/script/dom/navigator.rs index 969f006dd76..10b9732ddb6 100644 --- a/components/script/dom/navigator.rs +++ b/components/script/dom/navigator.rs @@ -136,7 +136,7 @@ impl Navigator { } } -impl NavigatorMethods for Navigator { +impl NavigatorMethods<crate::DomTypeHolder> for Navigator { // https://html.spec.whatwg.org/multipage/#dom-navigator-product fn Product(&self) -> DOMString { navigatorinfo::Product() diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index a102682d8c6..04408a9248c 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -2497,7 +2497,7 @@ impl Node { } } -impl NodeMethods for Node { +impl NodeMethods<crate::DomTypeHolder> for Node { /// <https://dom.spec.whatwg.org/#dom-node-nodetype> fn NodeType(&self) -> u16 { match self.type_id() { diff --git a/components/script/dom/nodeiterator.rs b/components/script/dom/nodeiterator.rs index 46bac1a8055..f02343be5df 100644 --- a/components/script/dom/nodeiterator.rs +++ b/components/script/dom/nodeiterator.rs @@ -69,7 +69,7 @@ impl NodeIterator { } } -impl NodeIteratorMethods for NodeIterator { +impl NodeIteratorMethods<crate::DomTypeHolder> for NodeIterator { // https://dom.spec.whatwg.org/#dom-nodeiterator-root fn Root(&self) -> DomRoot<Node> { DomRoot::from_ref(&*self.root_node) diff --git a/components/script/dom/nodelist.rs b/components/script/dom/nodelist.rs index 78e89640f7f..de892783101 100644 --- a/components/script/dom/nodelist.rs +++ b/components/script/dom/nodelist.rs @@ -90,7 +90,7 @@ impl NodeList { } } -impl NodeListMethods for NodeList { +impl NodeListMethods<crate::DomTypeHolder> for NodeList { // https://dom.spec.whatwg.org/#dom-nodelist-length fn Length(&self) -> u32 { match self.list_type { diff --git a/components/script/dom/offlineaudiocompletionevent.rs b/components/script/dom/offlineaudiocompletionevent.rs index 9cdbcea66c6..ab9144964dd 100644 --- a/components/script/dom/offlineaudiocompletionevent.rs +++ b/components/script/dom/offlineaudiocompletionevent.rs @@ -72,7 +72,7 @@ impl OfflineAudioCompletionEvent { } } -impl OfflineAudioCompletionEventMethods for OfflineAudioCompletionEvent { +impl OfflineAudioCompletionEventMethods<crate::DomTypeHolder> for OfflineAudioCompletionEvent { // https://webaudio.github.io/web-audio-api/#dom-offlineaudiocompletionevent-offlineaudiocompletionevent fn Constructor( window: &Window, diff --git a/components/script/dom/offlineaudiocontext.rs b/components/script/dom/offlineaudiocontext.rs index bd3f13f6dd8..e6f991001f2 100644 --- a/components/script/dom/offlineaudiocontext.rs +++ b/components/script/dom/offlineaudiocontext.rs @@ -98,7 +98,7 @@ impl OfflineAudioContext { } } -impl OfflineAudioContextMethods for OfflineAudioContext { +impl OfflineAudioContextMethods<crate::DomTypeHolder> for OfflineAudioContext { // https://webaudio.github.io/web-audio-api/#dom-offlineaudiocontext-offlineaudiocontext fn Constructor( window: &Window, diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs index 2be33688afc..a33aea573eb 100644 --- a/components/script/dom/offscreencanvas.rs +++ b/components/script/dom/offscreencanvas.rs @@ -138,7 +138,7 @@ impl OffscreenCanvas { } } -impl OffscreenCanvasMethods for OffscreenCanvas { +impl OffscreenCanvasMethods<crate::DomTypeHolder> for OffscreenCanvas { // https://html.spec.whatwg.org/multipage/#dom-offscreencanvas fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs index 23ed19b33e9..7eea394842d 100644 --- a/components/script/dom/offscreencanvasrenderingcontext2d.rs +++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs @@ -83,7 +83,9 @@ impl OffscreenCanvasRenderingContext2D { } } -impl OffscreenCanvasRenderingContext2DMethods for OffscreenCanvasRenderingContext2D { +impl OffscreenCanvasRenderingContext2DMethods<crate::DomTypeHolder> + for OffscreenCanvasRenderingContext2D +{ // https://html.spec.whatwg.org/multipage/offscreencontext2d-canvas fn Canvas(&self) -> DomRoot<OffscreenCanvas> { DomRoot::from_ref(&self.canvas) diff --git a/components/script/dom/oscillatornode.rs b/components/script/dom/oscillatornode.rs index 6ead040d873..7807eea01ab 100644 --- a/components/script/dom/oscillatornode.rs +++ b/components/script/dom/oscillatornode.rs @@ -114,7 +114,7 @@ impl OscillatorNode { } } -impl OscillatorNodeMethods for OscillatorNode { +impl OscillatorNodeMethods<crate::DomTypeHolder> for OscillatorNode { // https://webaudio.github.io/web-audio-api/#dom-oscillatornode-oscillatornode fn Constructor( window: &Window, diff --git a/components/script/dom/pagetransitionevent.rs b/components/script/dom/pagetransitionevent.rs index 99f364e67b3..4718f86afca 100644 --- a/components/script/dom/pagetransitionevent.rs +++ b/components/script/dom/pagetransitionevent.rs @@ -78,7 +78,7 @@ impl PageTransitionEvent { } } -impl PageTransitionEventMethods for PageTransitionEvent { +impl PageTransitionEventMethods<crate::DomTypeHolder> for PageTransitionEvent { // https://html.spec.whatwg.org/multipage/#pagetransitionevent fn Constructor( window: &Window, diff --git a/components/script/dom/paintrenderingcontext2d.rs b/components/script/dom/paintrenderingcontext2d.rs index 95c005dff30..26281eea112 100644 --- a/components/script/dom/paintrenderingcontext2d.rs +++ b/components/script/dom/paintrenderingcontext2d.rs @@ -85,7 +85,7 @@ impl PaintRenderingContext2D { } } -impl PaintRenderingContext2DMethods for PaintRenderingContext2D { +impl PaintRenderingContext2DMethods<crate::DomTypeHolder> for PaintRenderingContext2D { // https://html.spec.whatwg.org/multipage/#dom-context-2d-save fn Save(&self) { self.context.Save() diff --git a/components/script/dom/paintsize.rs b/components/script/dom/paintsize.rs index 900cfd8c6aa..b3a1348791e 100644 --- a/components/script/dom/paintsize.rs +++ b/components/script/dom/paintsize.rs @@ -36,7 +36,7 @@ impl PaintSize { } } -impl PaintSizeMethods for PaintSize { +impl PaintSizeMethods<crate::DomTypeHolder> for PaintSize { /// <https://drafts.css-houdini.org/css-paint-api/#paintsize> fn Width(&self) -> Finite<f64> { self.width diff --git a/components/script/dom/paintworkletglobalscope.rs b/components/script/dom/paintworkletglobalscope.rs index 4287b347a83..993b79ad17c 100644 --- a/components/script/dom/paintworkletglobalscope.rs +++ b/components/script/dom/paintworkletglobalscope.rs @@ -491,7 +491,7 @@ impl PaintDefinition { } } -impl PaintWorkletGlobalScopeMethods for PaintWorkletGlobalScope { +impl PaintWorkletGlobalScopeMethods<crate::DomTypeHolder> for PaintWorkletGlobalScope { #[allow(unsafe_code)] #[allow(crown::unrooted_must_root)] /// <https://drafts.css-houdini.org/css-paint-api/#dom-paintworkletglobalscope-registerpaint> diff --git a/components/script/dom/pannernode.rs b/components/script/dom/pannernode.rs index 7954f4c4940..c2d558a2e73 100644 --- a/components/script/dom/pannernode.rs +++ b/components/script/dom/pannernode.rs @@ -207,7 +207,7 @@ impl PannerNode { } } -impl PannerNodeMethods for PannerNode { +impl PannerNodeMethods<crate::DomTypeHolder> for PannerNode { // https://webaudio.github.io/web-audio-api/#dom-pannernode-pannernode fn Constructor( window: &Window, diff --git a/components/script/dom/performance.rs b/components/script/dom/performance.rs index 5ad3d63b40f..be440b0080d 100644 --- a/components/script/dom/performance.rs +++ b/components/script/dom/performance.rs @@ -414,7 +414,7 @@ impl Performance { } } -impl PerformanceMethods for Performance { +impl PerformanceMethods<crate::DomTypeHolder> for Performance { // FIXME(avada): this should be deprecated in the future, but some sites still use it // https://dvcs.w3.org/hg/webperf/raw-file/tip/specs/NavigationTiming/Overview.html#performance-timing-attribute fn Timing(&self) -> DomRoot<PerformanceNavigationTiming> { diff --git a/components/script/dom/performanceentry.rs b/components/script/dom/performanceentry.rs index 46f13d71515..30a6779c876 100644 --- a/components/script/dom/performanceentry.rs +++ b/components/script/dom/performanceentry.rs @@ -73,7 +73,7 @@ impl PerformanceEntry { } } -impl PerformanceEntryMethods for PerformanceEntry { +impl PerformanceEntryMethods<crate::DomTypeHolder> for PerformanceEntry { // https://w3c.github.io/performance-timeline/#dom-performanceentry-name fn Name(&self) -> DOMString { self.name.clone() diff --git a/components/script/dom/performancenavigation.rs b/components/script/dom/performancenavigation.rs index b37fe87f3dd..ede953eb081 100644 --- a/components/script/dom/performancenavigation.rs +++ b/components/script/dom/performancenavigation.rs @@ -29,7 +29,7 @@ impl PerformanceNavigation { } } -impl PerformanceNavigationMethods for PerformanceNavigation { +impl PerformanceNavigationMethods<crate::DomTypeHolder> for PerformanceNavigation { // https://w3c.github.io/navigation-timing/#dom-performancenavigation-type fn Type(&self) -> u16 { PerformanceNavigationConstants::TYPE_NAVIGATE diff --git a/components/script/dom/performancenavigationtiming.rs b/components/script/dom/performancenavigationtiming.rs index b4489fa8122..844c740a487 100644 --- a/components/script/dom/performancenavigationtiming.rs +++ b/components/script/dom/performancenavigationtiming.rs @@ -60,7 +60,7 @@ impl PerformanceNavigationTiming { } // https://w3c.github.io/navigation-timing/ -impl PerformanceNavigationTimingMethods for PerformanceNavigationTiming { +impl PerformanceNavigationTimingMethods<crate::DomTypeHolder> for PerformanceNavigationTiming { // https://w3c.github.io/navigation-timing/#dom-performancenavigationtiming-unloadeventstart fn UnloadEventStart(&self) -> DOMHighResTimeStamp { self.upcast::<PerformanceResourceTiming>() diff --git a/components/script/dom/performanceobserver.rs b/components/script/dom/performanceobserver.rs index f6d83d496dd..c65d1555c5b 100644 --- a/components/script/dom/performanceobserver.rs +++ b/components/script/dom/performanceobserver.rs @@ -118,7 +118,7 @@ impl PerformanceObserver { } } -impl PerformanceObserverMethods for PerformanceObserver { +impl PerformanceObserverMethods<crate::DomTypeHolder> for PerformanceObserver { // https://w3c.github.io/performance-timeline/#dom-performanceobserver-constructor fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/performanceobserverentrylist.rs b/components/script/dom/performanceobserverentrylist.rs index 12a38d0515a..0bea8bada55 100644 --- a/components/script/dom/performanceobserverentrylist.rs +++ b/components/script/dom/performanceobserverentrylist.rs @@ -37,7 +37,7 @@ impl PerformanceObserverEntryList { } } -impl PerformanceObserverEntryListMethods for PerformanceObserverEntryList { +impl PerformanceObserverEntryListMethods<crate::DomTypeHolder> for PerformanceObserverEntryList { // https://w3c.github.io/performance-timeline/#dom-performanceobserver fn GetEntries(&self) -> Vec<DomRoot<PerformanceEntry>> { self.entries diff --git a/components/script/dom/performanceresourcetiming.rs b/components/script/dom/performanceresourcetiming.rs index ac7791f9fed..de716b05ea2 100644 --- a/components/script/dom/performanceresourcetiming.rs +++ b/components/script/dom/performanceresourcetiming.rs @@ -185,7 +185,7 @@ impl PerformanceResourceTiming { } // https://w3c.github.io/resource-timing/ -impl PerformanceResourceTimingMethods for PerformanceResourceTiming { +impl PerformanceResourceTimingMethods<crate::DomTypeHolder> for PerformanceResourceTiming { // https://w3c.github.io/resource-timing/#dom-performanceresourcetiming-initiatortype fn InitiatorType(&self) -> DOMString { match self.initiator_type { diff --git a/components/script/dom/permissions.rs b/components/script/dom/permissions.rs index ee1e19ec72c..94698261093 100644 --- a/components/script/dom/permissions.rs +++ b/components/script/dom/permissions.rs @@ -190,7 +190,7 @@ impl Permissions { } #[allow(non_snake_case)] -impl PermissionsMethods for Permissions { +impl PermissionsMethods<crate::DomTypeHolder> for Permissions { // https://w3c.github.io/permissions/#dom-permissions-query fn Query(&self, cx: JSContext, permissionDesc: *mut JSObject, can_gc: CanGc) -> Rc<Promise> { self.manipulate(Operation::Query, cx, permissionDesc, None, can_gc) diff --git a/components/script/dom/permissionstatus.rs b/components/script/dom/permissionstatus.rs index e210b5087fc..c2262ca153d 100644 --- a/components/script/dom/permissionstatus.rs +++ b/components/script/dom/permissionstatus.rs @@ -48,7 +48,7 @@ impl PermissionStatus { } } -impl PermissionStatusMethods for PermissionStatus { +impl PermissionStatusMethods<crate::DomTypeHolder> for PermissionStatus { // https://w3c.github.io/permissions/#dom-permissionstatus-state fn State(&self) -> PermissionState { self.state.get() diff --git a/components/script/dom/plugin.rs b/components/script/dom/plugin.rs index 4b23191ff22..8352acf3c95 100644 --- a/components/script/dom/plugin.rs +++ b/components/script/dom/plugin.rs @@ -15,7 +15,7 @@ pub struct Plugin { reflector_: Reflector, } -impl PluginMethods for Plugin { +impl PluginMethods<crate::DomTypeHolder> for Plugin { // https://html.spec.whatwg.org/multipage/#dom-plugin-name fn Name(&self) -> DOMString { unreachable!() diff --git a/components/script/dom/pluginarray.rs b/components/script/dom/pluginarray.rs index a0afeb1f102..a1392ac43f7 100644 --- a/components/script/dom/pluginarray.rs +++ b/components/script/dom/pluginarray.rs @@ -28,7 +28,7 @@ impl PluginArray { } } -impl PluginArrayMethods for PluginArray { +impl PluginArrayMethods<crate::DomTypeHolder> for PluginArray { // https://html.spec.whatwg.org/multipage/#dom-pluginarray-refresh fn Refresh(&self, _reload: bool) {} diff --git a/components/script/dom/popstateevent.rs b/components/script/dom/popstateevent.rs index d0a8afe2048..b7140a0661d 100644 --- a/components/script/dom/popstateevent.rs +++ b/components/script/dom/popstateevent.rs @@ -81,7 +81,7 @@ impl PopStateEvent { } } -impl PopStateEventMethods for PopStateEvent { +impl PopStateEventMethods<crate::DomTypeHolder> for PopStateEvent { // https://html.spec.whatwg.org/multipage/#popstateevent fn Constructor( window: &Window, diff --git a/components/script/dom/processinginstruction.rs b/components/script/dom/processinginstruction.rs index 3d123296608..d09b1b9cd7d 100644 --- a/components/script/dom/processinginstruction.rs +++ b/components/script/dom/processinginstruction.rs @@ -51,7 +51,7 @@ impl ProcessingInstruction { } } -impl ProcessingInstructionMethods for ProcessingInstruction { +impl ProcessingInstructionMethods<crate::DomTypeHolder> for ProcessingInstruction { // https://dom.spec.whatwg.org/#dom-processinginstruction-target fn Target(&self) -> DOMString { self.target.clone() diff --git a/components/script/dom/progressevent.rs b/components/script/dom/progressevent.rs index bbe0db66cff..e46e0a314a4 100644 --- a/components/script/dom/progressevent.rs +++ b/components/script/dom/progressevent.rs @@ -90,7 +90,7 @@ impl ProgressEvent { } } -impl ProgressEventMethods for ProgressEvent { +impl ProgressEventMethods<crate::DomTypeHolder> for ProgressEvent { // https://xhr.spec.whatwg.org/#dom-progressevent-progressevent fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/promiserejectionevent.rs b/components/script/dom/promiserejectionevent.rs index 1a45790b7e1..30ca5ce5cf4 100644 --- a/components/script/dom/promiserejectionevent.rs +++ b/components/script/dom/promiserejectionevent.rs @@ -95,7 +95,7 @@ impl PromiseRejectionEvent { } } -impl PromiseRejectionEventMethods for PromiseRejectionEvent { +impl PromiseRejectionEventMethods<crate::DomTypeHolder> for PromiseRejectionEvent { // https://html.spec.whatwg.org/multipage/#promiserejectionevent fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/radionodelist.rs b/components/script/dom/radionodelist.rs index d7c4aa8bb9e..1614ab62c98 100644 --- a/components/script/dom/radionodelist.rs +++ b/components/script/dom/radionodelist.rs @@ -63,7 +63,7 @@ impl RadioNodeList { } } -impl RadioNodeListMethods for RadioNodeList { +impl RadioNodeListMethods<crate::DomTypeHolder> for RadioNodeList { // https://dom.spec.whatwg.org/#dom-nodelist-length // https://github.com/servo/servo/issues/5875 fn Length(&self) -> u32 { diff --git a/components/script/dom/range.rs b/components/script/dom/range.rs index 5801f1c7021..d6e4a403c1b 100644 --- a/components/script/dom/range.rs +++ b/components/script/dom/range.rs @@ -326,7 +326,7 @@ impl Range { } } -impl RangeMethods for Range { +impl RangeMethods<crate::DomTypeHolder> for Range { /// <https://dom.spec.whatwg.org/#dom-range> fn Constructor( window: &Window, diff --git a/components/script/dom/request.rs b/components/script/dom/request.rs index e205f3b3342..39d32c135cb 100644 --- a/components/script/dom/request.rs +++ b/components/script/dom/request.rs @@ -156,7 +156,7 @@ fn request_is_locked(input: &Request) -> bool { input.is_locked() } -impl RequestMethods for Request { +impl RequestMethods<crate::DomTypeHolder> for Request { // https://fetch.spec.whatwg.org/#dom-request fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/resizeobserver.rs b/components/script/dom/resizeobserver.rs index 31e111cb2ad..c5489002824 100644 --- a/components/script/dom/resizeobserver.rs +++ b/components/script/dom/resizeobserver.rs @@ -161,7 +161,7 @@ impl ResizeObserver { } } -impl ResizeObserverMethods for ResizeObserver { +impl ResizeObserverMethods<crate::DomTypeHolder> for ResizeObserver { /// <https://drafts.csswg.org/resize-observer/#dom-resizeobserver-resizeobserver> fn Constructor( window: &Window, diff --git a/components/script/dom/resizeobserverentry.rs b/components/script/dom/resizeobserverentry.rs index a5017c4868c..3ffd53fad99 100644 --- a/components/script/dom/resizeobserverentry.rs +++ b/components/script/dom/resizeobserverentry.rs @@ -78,7 +78,7 @@ impl ResizeObserverEntry { } } -impl ResizeObserverEntryMethods for ResizeObserverEntry { +impl ResizeObserverEntryMethods<crate::DomTypeHolder> for ResizeObserverEntry { /// <https://drafts.csswg.org/resize-observer/#dom-resizeobserverentry-target> fn Target(&self) -> DomRoot<Element> { DomRoot::from_ref(&*self.target) diff --git a/components/script/dom/resizeobserversize.rs b/components/script/dom/resizeobserversize.rs index 055472a3ca8..db5ef2a7e96 100644 --- a/components/script/dom/resizeobserversize.rs +++ b/components/script/dom/resizeobserversize.rs @@ -59,7 +59,7 @@ impl ResizeObserverSize { } } -impl ResizeObserverSizeMethods for ResizeObserverSize { +impl ResizeObserverSizeMethods<crate::DomTypeHolder> for ResizeObserverSize { /// <https://drafts.csswg.org/resize-observer/#dom-resizeobserversize-inlinesize> fn InlineSize(&self) -> f64 { self.size_impl.inline_size() diff --git a/components/script/dom/response.rs b/components/script/dom/response.rs index 258247fb2d9..83c94e91874 100644 --- a/components/script/dom/response.rs +++ b/components/script/dom/response.rs @@ -140,7 +140,7 @@ fn is_null_body_status(status: u16) -> bool { status == 101 || status == 204 || status == 205 || status == 304 } -impl ResponseMethods for Response { +impl ResponseMethods<crate::DomTypeHolder> for Response { // https://fetch.spec.whatwg.org/#initialize-a-response fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/rtcdatachannel.rs b/components/script/dom/rtcdatachannel.rs index ab38b461546..0c5ca6e3abf 100644 --- a/components/script/dom/rtcdatachannel.rs +++ b/components/script/dom/rtcdatachannel.rs @@ -256,7 +256,7 @@ enum SendSource<'a, 'b> { ArrayBufferView(CustomAutoRooterGuard<'b, ArrayBufferView>), } -impl RTCDataChannelMethods for RTCDataChannel { +impl RTCDataChannelMethods<crate::DomTypeHolder> for RTCDataChannel { // https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-onopen event_handler!(open, GetOnopen, SetOnopen); // https://www.w3.org/TR/webrtc/#dom-rtcdatachannel-onbufferedamountlow diff --git a/components/script/dom/rtcdatachannelevent.rs b/components/script/dom/rtcdatachannelevent.rs index 55898897afc..dc35fc55621 100644 --- a/components/script/dom/rtcdatachannelevent.rs +++ b/components/script/dom/rtcdatachannelevent.rs @@ -68,7 +68,7 @@ impl RTCDataChannelEvent { } } -impl RTCDataChannelEventMethods for RTCDataChannelEvent { +impl RTCDataChannelEventMethods<crate::DomTypeHolder> for RTCDataChannelEvent { // https://www.w3.org/TR/webrtc/#dom-rtcdatachannelevent-constructor fn Constructor( window: &Window, diff --git a/components/script/dom/rtcerror.rs b/components/script/dom/rtcerror.rs index 372a96f6989..c58a09d4d01 100644 --- a/components/script/dom/rtcerror.rs +++ b/components/script/dom/rtcerror.rs @@ -68,7 +68,7 @@ impl RTCError { } } -impl RTCErrorMethods for RTCError { +impl RTCErrorMethods<crate::DomTypeHolder> for RTCError { // https://www.w3.org/TR/webrtc/#dom-rtcerror-constructor fn Constructor( window: &Window, diff --git a/components/script/dom/rtcerrorevent.rs b/components/script/dom/rtcerrorevent.rs index 66d93b7fca9..9dccf41402e 100644 --- a/components/script/dom/rtcerrorevent.rs +++ b/components/script/dom/rtcerrorevent.rs @@ -68,7 +68,7 @@ impl RTCErrorEvent { } } -impl RTCErrorEventMethods for RTCErrorEvent { +impl RTCErrorEventMethods<crate::DomTypeHolder> for RTCErrorEvent { // https://www.w3.org/TR/webrtc/#dom-rtcerrorevent-constructor fn Constructor( window: &Window, diff --git a/components/script/dom/rtcicecandidate.rs b/components/script/dom/rtcicecandidate.rs index 3d3d60fdad3..1fec862fc60 100644 --- a/components/script/dom/rtcicecandidate.rs +++ b/components/script/dom/rtcicecandidate.rs @@ -83,7 +83,7 @@ impl RTCIceCandidate { } } -impl RTCIceCandidateMethods for RTCIceCandidate { +impl RTCIceCandidateMethods<crate::DomTypeHolder> for RTCIceCandidate { /// <https://w3c.github.io/webrtc-pc/#dom-rtcicecandidate-constructor> fn Constructor( window: &Window, diff --git a/components/script/dom/rtcpeerconnection.rs b/components/script/dom/rtcpeerconnection.rs index 28e39837f3b..60b40135273 100644 --- a/components/script/dom/rtcpeerconnection.rs +++ b/components/script/dom/rtcpeerconnection.rs @@ -523,7 +523,7 @@ impl RTCPeerConnection { } } -impl RTCPeerConnectionMethods for RTCPeerConnection { +impl RTCPeerConnectionMethods<crate::DomTypeHolder> for RTCPeerConnection { // https://w3c.github.io/webrtc-pc/#dom-peerconnection fn Constructor( window: &Window, diff --git a/components/script/dom/rtcpeerconnectioniceevent.rs b/components/script/dom/rtcpeerconnectioniceevent.rs index a1f1aa6575b..e677b96b3f9 100644 --- a/components/script/dom/rtcpeerconnectioniceevent.rs +++ b/components/script/dom/rtcpeerconnectioniceevent.rs @@ -73,7 +73,7 @@ impl RTCPeerConnectionIceEvent { } } -impl RTCPeerConnectionIceEventMethods for RTCPeerConnectionIceEvent { +impl RTCPeerConnectionIceEventMethods<crate::DomTypeHolder> for RTCPeerConnectionIceEvent { /// <https://w3c.github.io/webrtc-pc/#dom-rtcpeerconnectioniceevent-constructor> fn Constructor( window: &Window, diff --git a/components/script/dom/rtcrtpsender.rs b/components/script/dom/rtcrtpsender.rs index 08dba4ed884..409254269c0 100644 --- a/components/script/dom/rtcrtpsender.rs +++ b/components/script/dom/rtcrtpsender.rs @@ -33,7 +33,7 @@ impl RTCRtpSender { } } -impl RTCRtpSenderMethods for RTCRtpSender { +impl RTCRtpSenderMethods<crate::DomTypeHolder> for RTCRtpSender { // https://w3c.github.io/webrtc-pc/#dom-rtcrtpsender-getparameters fn GetParameters(&self) -> RTCRtpSendParameters { RTCRtpSendParameters { diff --git a/components/script/dom/rtcrtptransceiver.rs b/components/script/dom/rtcrtptransceiver.rs index 6ac881fe56a..742bfc62390 100644 --- a/components/script/dom/rtcrtptransceiver.rs +++ b/components/script/dom/rtcrtptransceiver.rs @@ -39,7 +39,7 @@ impl RTCRtpTransceiver { } } -impl RTCRtpTransceiverMethods for RTCRtpTransceiver { +impl RTCRtpTransceiverMethods<crate::DomTypeHolder> for RTCRtpTransceiver { /// <https://w3c.github.io/webrtc-pc/#dom-rtcrtptransceiver-direction> fn Direction(&self) -> RTCRtpTransceiverDirection { self.direction.get() diff --git a/components/script/dom/rtcsessiondescription.rs b/components/script/dom/rtcsessiondescription.rs index 19a790c155b..fae3d5f6b3b 100644 --- a/components/script/dom/rtcsessiondescription.rs +++ b/components/script/dom/rtcsessiondescription.rs @@ -48,7 +48,7 @@ impl RTCSessionDescription { } } -impl RTCSessionDescriptionMethods for RTCSessionDescription { +impl RTCSessionDescriptionMethods<crate::DomTypeHolder> for RTCSessionDescription { /// <https://w3c.github.io/webrtc-pc/#dom-sessiondescription> fn Constructor( window: &Window, diff --git a/components/script/dom/rtctrackevent.rs b/components/script/dom/rtctrackevent.rs index 49626d27095..03779eae794 100644 --- a/components/script/dom/rtctrackevent.rs +++ b/components/script/dom/rtctrackevent.rs @@ -68,7 +68,7 @@ impl RTCTrackEvent { } } -impl RTCTrackEventMethods for RTCTrackEvent { +impl RTCTrackEventMethods<crate::DomTypeHolder> for RTCTrackEvent { // https://w3c.github.io/webrtc-pc/#dom-rtctrackevent-constructor fn Constructor( window: &Window, diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs index f45f6355269..2b29744f6a6 100644 --- a/components/script/dom/screen.rs +++ b/components/script/dom/screen.rs @@ -60,7 +60,7 @@ impl Screen { } } -impl ScreenMethods for Screen { +impl ScreenMethods<crate::DomTypeHolder> for Screen { // https://drafts.csswg.org/cssom-view/#dom-screen-availwidth fn AvailWidth(&self) -> Finite<f64> { Finite::wrap(self.screen_avail_size().width as f64) diff --git a/components/script/dom/securitypolicyviolationevent.rs b/components/script/dom/securitypolicyviolationevent.rs index f258e326955..31bb29af2d2 100644 --- a/components/script/dom/securitypolicyviolationevent.rs +++ b/components/script/dom/securitypolicyviolationevent.rs @@ -100,7 +100,7 @@ impl SecurityPolicyViolationEvent { } #[allow(non_snake_case)] -impl SecurityPolicyViolationEventMethods for SecurityPolicyViolationEvent { +impl SecurityPolicyViolationEventMethods<crate::DomTypeHolder> for SecurityPolicyViolationEvent { /// <https://w3c.github.io/webappsec-csp/#dom-securitypolicyviolationevent-securitypolicyviolationevent> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/selection.rs b/components/script/dom/selection.rs index fbe5047a12e..169f177318d 100644 --- a/components/script/dom/selection.rs +++ b/components/script/dom/selection.rs @@ -109,7 +109,7 @@ impl Selection { } } -impl SelectionMethods for Selection { +impl SelectionMethods<crate::DomTypeHolder> for Selection { // https://w3c.github.io/selection-api/#dom-selection-anchornode fn GetAnchorNode(&self) -> Option<DomRoot<Node>> { if let Some(range) = self.range.get() { diff --git a/components/script/dom/serviceworker.rs b/components/script/dom/serviceworker.rs index e6ce9968559..264318cf39f 100644 --- a/components/script/dom/serviceworker.rs +++ b/components/script/dom/serviceworker.rs @@ -118,7 +118,7 @@ impl ServiceWorker { } } -impl ServiceWorkerMethods for ServiceWorker { +impl ServiceWorkerMethods<crate::DomTypeHolder> for ServiceWorker { // https://w3c.github.io/ServiceWorker/#service-worker-state-attribute fn State(&self) -> ServiceWorkerState { self.state.get() diff --git a/components/script/dom/serviceworkercontainer.rs b/components/script/dom/serviceworkercontainer.rs index 35121fba3a8..7ea6ea12e1a 100644 --- a/components/script/dom/serviceworkercontainer.rs +++ b/components/script/dom/serviceworkercontainer.rs @@ -54,7 +54,7 @@ impl ServiceWorkerContainer { } } -impl ServiceWorkerContainerMethods for ServiceWorkerContainer { +impl ServiceWorkerContainerMethods<crate::DomTypeHolder> for ServiceWorkerContainer { // https://w3c.github.io/ServiceWorker/#service-worker-container-controller-attribute fn GetController(&self) -> Option<DomRoot<ServiceWorker>> { self.client.get_controller() diff --git a/components/script/dom/serviceworkerglobalscope.rs b/components/script/dom/serviceworkerglobalscope.rs index 479c4d82fcd..2c2598f6833 100644 --- a/components/script/dom/serviceworkerglobalscope.rs +++ b/components/script/dom/serviceworkerglobalscope.rs @@ -502,7 +502,7 @@ unsafe extern "C" fn interrupt_callback(cx: *mut JSContext) -> bool { !worker.is_closing() } -impl ServiceWorkerGlobalScopeMethods for ServiceWorkerGlobalScope { +impl ServiceWorkerGlobalScopeMethods<crate::DomTypeHolder> for ServiceWorkerGlobalScope { // https://w3c.github.io/ServiceWorker/#dom-serviceworkerglobalscope-onmessage event_handler!(message, GetOnmessage, SetOnmessage); diff --git a/components/script/dom/serviceworkerregistration.rs b/components/script/dom/serviceworkerregistration.rs index bd617942e07..59a4cb698bd 100644 --- a/components/script/dom/serviceworkerregistration.rs +++ b/components/script/dom/serviceworkerregistration.rs @@ -164,7 +164,7 @@ pub fn longest_prefix_match(stored_scope: &ServoUrl, potential_match: &ServoUrl) .all(|(scope, matched)| scope == matched) } -impl ServiceWorkerRegistrationMethods for ServiceWorkerRegistration { +impl ServiceWorkerRegistrationMethods<crate::DomTypeHolder> for ServiceWorkerRegistration { // https://w3c.github.io/ServiceWorker/#service-worker-registration-installing-attribute fn GetInstalling(&self) -> Option<DomRoot<ServiceWorker>> { self.installing diff --git a/components/script/dom/shadowroot.rs b/components/script/dom/shadowroot.rs index d7810806864..ca53ac9606d 100644 --- a/components/script/dom/shadowroot.rs +++ b/components/script/dom/shadowroot.rs @@ -176,7 +176,7 @@ impl ShadowRoot { } } -impl ShadowRootMethods for ShadowRoot { +impl ShadowRootMethods<crate::DomTypeHolder> for ShadowRoot { // https://html.spec.whatwg.org/multipage/#dom-document-activeelement fn GetActiveElement(&self) -> Option<DomRoot<Element>> { self.document_or_shadow_root diff --git a/components/script/dom/staticrange.rs b/components/script/dom/staticrange.rs index 273beb16ad0..31c4e276338 100644 --- a/components/script/dom/staticrange.rs +++ b/components/script/dom/staticrange.rs @@ -6,7 +6,9 @@ use dom_struct::dom_struct; use js::rust::HandleObject; use crate::dom::abstractrange::AbstractRange; -use crate::dom::bindings::codegen::Bindings::StaticRangeBinding::StaticRangeInit; +use crate::dom::bindings::codegen::Bindings::StaticRangeBinding::{ + StaticRangeInit, StaticRangeMethods, +}; use crate::dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::inheritance::NodeTypeId; @@ -66,10 +68,12 @@ impl StaticRange { ); staticrange } +} +impl StaticRangeMethods<crate::DomTypeHolder> for StaticRange { /// <https://dom.spec.whatwg.org/#dom-staticrange-staticrange> #[allow(non_snake_case)] - pub fn Constructor( + fn Constructor( window: &Window, proto: Option<HandleObject>, can_gc: CanGc, diff --git a/components/script/dom/stereopannernode.rs b/components/script/dom/stereopannernode.rs index 1e1b05a7b43..6a7929b8735 100644 --- a/components/script/dom/stereopannernode.rs +++ b/components/script/dom/stereopannernode.rs @@ -101,7 +101,7 @@ impl StereoPannerNode { } } -impl StereoPannerNodeMethods for StereoPannerNode { +impl StereoPannerNodeMethods<crate::DomTypeHolder> for StereoPannerNode { // https://webaudio.github.io/web-audio-api/#dom-stereopannernode-stereopannernode fn Constructor( window: &Window, diff --git a/components/script/dom/storage.rs b/components/script/dom/storage.rs index 030c0957217..4e230f554f7 100644 --- a/components/script/dom/storage.rs +++ b/components/script/dom/storage.rs @@ -51,7 +51,7 @@ impl Storage { } } -impl StorageMethods for Storage { +impl StorageMethods<crate::DomTypeHolder> for Storage { // https://html.spec.whatwg.org/multipage/#dom-storage-length fn Length(&self) -> u32 { let (sender, receiver) = ipc::channel(self.global().time_profiler_chan().clone()).unwrap(); diff --git a/components/script/dom/storageevent.rs b/components/script/dom/storageevent.rs index 2fc491c54a8..a99e8ce1a6d 100644 --- a/components/script/dom/storageevent.rs +++ b/components/script/dom/storageevent.rs @@ -134,7 +134,7 @@ impl StorageEvent { } #[allow(non_snake_case)] -impl StorageEventMethods for StorageEvent { +impl StorageEventMethods<crate::DomTypeHolder> for StorageEvent { // https://html.spec.whatwg.org/multipage/#storageevent fn Constructor( global: &Window, diff --git a/components/script/dom/stylepropertymapreadonly.rs b/components/script/dom/stylepropertymapreadonly.rs index 78aaeede4a3..96eb481e90d 100644 --- a/components/script/dom/stylepropertymapreadonly.rs +++ b/components/script/dom/stylepropertymapreadonly.rs @@ -60,7 +60,7 @@ impl StylePropertyMapReadOnly { } } -impl StylePropertyMapReadOnlyMethods for StylePropertyMapReadOnly { +impl StylePropertyMapReadOnlyMethods<crate::DomTypeHolder> for StylePropertyMapReadOnly { /// <https://drafts.css-houdini.org/css-typed-om-1/#dom-stylepropertymapreadonly-get> fn Get(&self, property: DOMString) -> Option<DomRoot<CSSStyleValue>> { // TODO: avoid constructing an Atom diff --git a/components/script/dom/stylesheet.rs b/components/script/dom/stylesheet.rs index 3a35302c58e..bedb79c931d 100644 --- a/components/script/dom/stylesheet.rs +++ b/components/script/dom/stylesheet.rs @@ -37,7 +37,7 @@ impl StyleSheet { } } -impl StyleSheetMethods for StyleSheet { +impl StyleSheetMethods<crate::DomTypeHolder> for StyleSheet { // https://drafts.csswg.org/cssom/#dom-stylesheet-type fn Type_(&self) -> DOMString { self.type_.clone() diff --git a/components/script/dom/stylesheetlist.rs b/components/script/dom/stylesheetlist.rs index f430b905584..87d5838bfee 100644 --- a/components/script/dom/stylesheetlist.rs +++ b/components/script/dom/stylesheetlist.rs @@ -87,7 +87,7 @@ impl StyleSheetList { } } -impl StyleSheetListMethods for StyleSheetList { +impl StyleSheetListMethods<crate::DomTypeHolder> for StyleSheetList { // https://drafts.csswg.org/cssom/#dom-stylesheetlist-length fn Length(&self) -> u32 { self.document_or_shadow_root.stylesheet_count() as u32 diff --git a/components/script/dom/submitevent.rs b/components/script/dom/submitevent.rs index ea95805cbf5..6fb4e345b72 100644 --- a/components/script/dom/submitevent.rs +++ b/components/script/dom/submitevent.rs @@ -68,7 +68,7 @@ impl SubmitEvent { } } -impl SubmitEventMethods for SubmitEvent { +impl SubmitEventMethods<crate::DomTypeHolder> for SubmitEvent { /// <https://html.spec.whatwg.org/multipage/#submitevent> fn Constructor( window: &Window, diff --git a/components/script/dom/subtlecrypto.rs b/components/script/dom/subtlecrypto.rs index 583e3d0eb01..fe37f7d724c 100644 --- a/components/script/dom/subtlecrypto.rs +++ b/components/script/dom/subtlecrypto.rs @@ -153,7 +153,7 @@ impl SubtleCrypto { } } -impl SubtleCryptoMethods for SubtleCrypto { +impl SubtleCryptoMethods<crate::DomTypeHolder> for SubtleCrypto { /// <https://w3c.github.io/webcrypto/#SubtleCrypto-method-encrypt> fn Encrypt( &self, diff --git a/components/script/dom/svgelement.rs b/components/script/dom/svgelement.rs index 9a9b79a2ad6..3c738b1f54e 100644 --- a/components/script/dom/svgelement.rs +++ b/components/script/dom/svgelement.rs @@ -66,7 +66,7 @@ impl VirtualMethods for SVGElement { } } -impl SVGElementMethods for SVGElement { +impl SVGElementMethods<crate::DomTypeHolder> for SVGElement { // https://html.spec.whatwg.org/multipage/#the-style-attribute fn Style(&self) -> DomRoot<CSSStyleDeclaration> { self.style_decl.or_init(|| { diff --git a/components/script/dom/testbinding.rs b/components/script/dom/testbinding.rs index 1fc70eac60d..530544c97e1 100644 --- a/components/script/dom/testbinding.rs +++ b/components/script/dom/testbinding.rs @@ -81,7 +81,7 @@ impl TestBinding { } } -impl TestBindingMethods for TestBinding { +impl TestBindingMethods<crate::DomTypeHolder> for TestBinding { fn Constructor( global: &GlobalScope, proto: Option<HandleObject>, diff --git a/components/script/dom/testbindingiterable.rs b/components/script/dom/testbindingiterable.rs index 616d0296405..85fa46d2cb2 100644 --- a/components/script/dom/testbindingiterable.rs +++ b/components/script/dom/testbindingiterable.rs @@ -40,7 +40,7 @@ impl TestBindingIterable { } } -impl TestBindingIterableMethods for TestBindingIterable { +impl TestBindingIterableMethods<crate::DomTypeHolder> for TestBindingIterable { fn Constructor( global: &GlobalScope, proto: Option<HandleObject>, diff --git a/components/script/dom/testbindingmaplike.rs b/components/script/dom/testbindingmaplike.rs index f44f6aabd28..86b4c423939 100644 --- a/components/script/dom/testbindingmaplike.rs +++ b/components/script/dom/testbindingmaplike.rs @@ -46,7 +46,7 @@ impl TestBindingMaplike { } } -impl TestBindingMaplikeMethods for TestBindingMaplike { +impl TestBindingMaplikeMethods<crate::DomTypeHolder> for TestBindingMaplike { fn Constructor( global: &GlobalScope, proto: Option<HandleObject>, diff --git a/components/script/dom/testbindingpairiterable.rs b/components/script/dom/testbindingpairiterable.rs index 02febf599e3..8f11432d45a 100644 --- a/components/script/dom/testbindingpairiterable.rs +++ b/components/script/dom/testbindingpairiterable.rs @@ -60,7 +60,7 @@ impl TestBindingPairIterable { } } -impl TestBindingPairIterableMethods for TestBindingPairIterable { +impl TestBindingPairIterableMethods<crate::DomTypeHolder> for TestBindingPairIterable { fn Constructor( global: &GlobalScope, proto: Option<HandleObject>, diff --git a/components/script/dom/testbindingproxy.rs b/components/script/dom/testbindingproxy.rs index 55be0bfc28b..4908d078bed 100644 --- a/components/script/dom/testbindingproxy.rs +++ b/components/script/dom/testbindingproxy.rs @@ -15,7 +15,7 @@ pub struct TestBindingProxy { testbinding_: TestBinding, } -impl TestBindingProxyMethods for TestBindingProxy { +impl TestBindingProxyMethods<crate::DomTypeHolder> for TestBindingProxy { fn Length(&self) -> u32 { 0 } diff --git a/components/script/dom/testbindingsetlike.rs b/components/script/dom/testbindingsetlike.rs index 19db2a8d154..3bf26c17f7f 100644 --- a/components/script/dom/testbindingsetlike.rs +++ b/components/script/dom/testbindingsetlike.rs @@ -45,7 +45,7 @@ impl TestBindingSetlike { } } -impl TestBindingSetlikeMethods for TestBindingSetlike { +impl TestBindingSetlikeMethods<crate::DomTypeHolder> for TestBindingSetlike { fn Constructor( global: &GlobalScope, proto: Option<HandleObject>, diff --git a/components/script/dom/testrunner.rs b/components/script/dom/testrunner.rs index 9efd6673502..ae62777bab7 100644 --- a/components/script/dom/testrunner.rs +++ b/components/script/dom/testrunner.rs @@ -36,7 +36,7 @@ impl TestRunner { } } -impl TestRunnerMethods for TestRunner { +impl TestRunnerMethods<crate::DomTypeHolder> for TestRunner { // https://webbluetoothcg.github.io/web-bluetooth/tests#setBluetoothMockDataSet #[allow(non_snake_case)] fn SetBluetoothMockDataSet(&self, dataSetName: DOMString) -> ErrorResult { diff --git a/components/script/dom/testworklet.rs b/components/script/dom/testworklet.rs index 9f3fa667590..b1589dd24f8 100644 --- a/components/script/dom/testworklet.rs +++ b/components/script/dom/testworklet.rs @@ -48,7 +48,7 @@ impl TestWorklet { } } -impl TestWorkletMethods for TestWorklet { +impl TestWorkletMethods<crate::DomTypeHolder> for TestWorklet { fn Constructor( window: &Window, proto: Option<HandleObject>, diff --git a/components/script/dom/testworkletglobalscope.rs b/components/script/dom/testworkletglobalscope.rs index 2540bc31415..8e5597ba10e 100644 --- a/components/script/dom/testworkletglobalscope.rs +++ b/components/script/dom/testworkletglobalscope.rs @@ -65,7 +65,7 @@ impl TestWorkletGlobalScope { } } -impl TestWorkletGlobalScopeMethods for TestWorkletGlobalScope { +impl TestWorkletGlobalScopeMethods<crate::DomTypeHolder> for TestWorkletGlobalScope { fn RegisterKeyValue(&self, key: DOMString, value: DOMString) { debug!("Registering test worklet key/value {}/{}.", key, value); self.lookup_table diff --git a/components/script/dom/text.rs b/components/script/dom/text.rs index c9381f207a8..b2d3fab2396 100644 --- a/components/script/dom/text.rs +++ b/components/script/dom/text.rs @@ -52,7 +52,7 @@ impl Text { } } -impl TextMethods for Text { +impl TextMethods<crate::DomTypeHolder> for Text { // https://dom.spec.whatwg.org/#dom-text-text fn Constructor( window: &Window, diff --git a/components/script/dom/textdecoder.rs b/components/script/dom/textdecoder.rs index 3491503bb91..c1312631647 100644 --- a/components/script/dom/textdecoder.rs +++ b/components/script/dom/textdecoder.rs @@ -77,7 +77,7 @@ impl TextDecoder { } } -impl TextDecoderMethods for TextDecoder { +impl TextDecoderMethods<crate::DomTypeHolder> for TextDecoder { /// <https://encoding.spec.whatwg.org/#dom-textdecoder> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/textencoder.rs b/components/script/dom/textencoder.rs index 6a237abcfaf..55c5346029c 100644 --- a/components/script/dom/textencoder.rs +++ b/components/script/dom/textencoder.rs @@ -48,7 +48,7 @@ impl TextEncoder { } } -impl TextEncoderMethods for TextEncoder { +impl TextEncoderMethods<crate::DomTypeHolder> for TextEncoder { /// <https://encoding.spec.whatwg.org/#dom-textencoder> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/textmetrics.rs b/components/script/dom/textmetrics.rs index 338edd023f2..6f7af09809e 100644 --- a/components/script/dom/textmetrics.rs +++ b/components/script/dom/textmetrics.rs @@ -98,7 +98,7 @@ impl TextMetrics { } } -impl TextMetricsMethods for TextMetrics { +impl TextMetricsMethods<crate::DomTypeHolder> for TextMetrics { /// <https://html.spec.whatwg.org/multipage/#dom-textmetrics-width> fn Width(&self) -> Finite<f64> { self.width diff --git a/components/script/dom/texttrack.rs b/components/script/dom/texttrack.rs index 390f5388962..a5d4686b796 100644 --- a/components/script/dom/texttrack.rs +++ b/components/script/dom/texttrack.rs @@ -88,7 +88,7 @@ impl TextTrack { } } -impl TextTrackMethods for TextTrack { +impl TextTrackMethods<crate::DomTypeHolder> for TextTrack { // https://html.spec.whatwg.org/multipage/#dom-texttrack-kind fn Kind(&self) -> TextTrackKind { self.kind diff --git a/components/script/dom/texttrackcue.rs b/components/script/dom/texttrackcue.rs index 5a0f7f3abef..f3c1d885a1a 100644 --- a/components/script/dom/texttrackcue.rs +++ b/components/script/dom/texttrackcue.rs @@ -66,7 +66,7 @@ impl TextTrackCue { } } -impl TextTrackCueMethods for TextTrackCue { +impl TextTrackCueMethods<crate::DomTypeHolder> for TextTrackCue { // https://html.spec.whatwg.org/multipage/#dom-texttrackcue-id fn Id(&self) -> DOMString { self.id() diff --git a/components/script/dom/texttrackcuelist.rs b/components/script/dom/texttrackcuelist.rs index 6c7e01e9c38..69c2f836a59 100644 --- a/components/script/dom/texttrackcuelist.rs +++ b/components/script/dom/texttrackcuelist.rs @@ -58,7 +58,7 @@ impl TextTrackCueList { } } -impl TextTrackCueListMethods for TextTrackCueList { +impl TextTrackCueListMethods<crate::DomTypeHolder> for TextTrackCueList { // https://html.spec.whatwg.org/multipage/#dom-texttrackcuelist-length fn Length(&self) -> u32 { self.dom_cues.borrow().len() as u32 diff --git a/components/script/dom/texttracklist.rs b/components/script/dom/texttracklist.rs index 51aba9b0f05..e5a3ad52c2c 100644 --- a/components/script/dom/texttracklist.rs +++ b/components/script/dom/texttracklist.rs @@ -109,7 +109,7 @@ impl TextTrackList { } } -impl TextTrackListMethods for TextTrackList { +impl TextTrackListMethods<crate::DomTypeHolder> for TextTrackList { // https://html.spec.whatwg.org/multipage/#dom-texttracklist-length fn Length(&self) -> u32 { self.dom_tracks.borrow().len() as u32 diff --git a/components/script/dom/timeranges.rs b/components/script/dom/timeranges.rs index 496f7ee8090..c5fe744489d 100644 --- a/components/script/dom/timeranges.rs +++ b/components/script/dom/timeranges.rs @@ -143,7 +143,7 @@ impl TimeRanges { } } -impl TimeRangesMethods for TimeRanges { +impl TimeRangesMethods<crate::DomTypeHolder> for TimeRanges { // https://html.spec.whatwg.org/multipage/#dom-timeranges-length fn Length(&self) -> u32 { self.ranges.len() diff --git a/components/script/dom/touch.rs b/components/script/dom/touch.rs index fcb1c1bee86..982f74a58bc 100644 --- a/components/script/dom/touch.rs +++ b/components/script/dom/touch.rs @@ -70,7 +70,7 @@ impl Touch { } } -impl TouchMethods for Touch { +impl TouchMethods<crate::DomTypeHolder> for Touch { /// <https://w3c.github.io/touch-events/#widl-Touch-identifier> fn Identifier(&self) -> i32 { self.identifier diff --git a/components/script/dom/touchevent.rs b/components/script/dom/touchevent.rs index 1bb29e81178..7ef9e20b899 100644 --- a/components/script/dom/touchevent.rs +++ b/components/script/dom/touchevent.rs @@ -95,7 +95,7 @@ impl TouchEvent { } } -impl<'a> TouchEventMethods for &'a TouchEvent { +impl TouchEventMethods<crate::DomTypeHolder> for TouchEvent { /// <https://w3c.github.io/touch-events/#widl-TouchEvent-ctrlKey> fn CtrlKey(&self) -> bool { self.ctrl_key.get() diff --git a/components/script/dom/touchlist.rs b/components/script/dom/touchlist.rs index ede60a456ce..e139f23b2af 100644 --- a/components/script/dom/touchlist.rs +++ b/components/script/dom/touchlist.rs @@ -29,7 +29,7 @@ impl TouchList { } } -impl TouchListMethods for TouchList { +impl TouchListMethods<crate::DomTypeHolder> for TouchList { /// <https://w3c.github.io/touch-events/#widl-TouchList-length> fn Length(&self) -> u32 { self.touches.len() as u32 diff --git a/components/script/dom/trackevent.rs b/components/script/dom/trackevent.rs index dfe9f2c0303..5a9c7b44578 100644 --- a/components/script/dom/trackevent.rs +++ b/components/script/dom/trackevent.rs @@ -93,7 +93,7 @@ impl TrackEvent { } } -impl TrackEventMethods for TrackEvent { +impl TrackEventMethods<crate::DomTypeHolder> for TrackEvent { // https://html.spec.whatwg.org/multipage/#trackevent fn Constructor( window: &Window, diff --git a/components/script/dom/transitionevent.rs b/components/script/dom/transitionevent.rs index 3e21a161934..66e7669ba69 100644 --- a/components/script/dom/transitionevent.rs +++ b/components/script/dom/transitionevent.rs @@ -69,7 +69,7 @@ impl TransitionEvent { } } -impl TransitionEventMethods for TransitionEvent { +impl TransitionEventMethods<crate::DomTypeHolder> for TransitionEvent { // https://drafts.csswg.org/css-transitions/#dom-transitionevent-transitionevent fn Constructor( window: &Window, diff --git a/components/script/dom/treewalker.rs b/components/script/dom/treewalker.rs index 97c5da54c50..22631b65d38 100644 --- a/components/script/dom/treewalker.rs +++ b/components/script/dom/treewalker.rs @@ -67,7 +67,7 @@ impl TreeWalker { } } -impl TreeWalkerMethods for TreeWalker { +impl TreeWalkerMethods<crate::DomTypeHolder> for TreeWalker { // https://dom.spec.whatwg.org/#dom-treewalker-root fn Root(&self) -> DomRoot<Node> { DomRoot::from_ref(&*self.root_node) diff --git a/components/script/dom/uievent.rs b/components/script/dom/uievent.rs index b9da7792908..a868f0e9588 100644 --- a/components/script/dom/uievent.rs +++ b/components/script/dom/uievent.rs @@ -87,7 +87,7 @@ impl UIEvent { } } -impl UIEventMethods for UIEvent { +impl UIEventMethods<crate::DomTypeHolder> for UIEvent { /// <https://w3c.github.io/uievents/#dom-uievent-uievent> fn Constructor( window: &Window, diff --git a/components/script/dom/url.rs b/components/script/dom/url.rs index 0b5b798a51a..f9f87a9bba3 100644 --- a/components/script/dom/url.rs +++ b/components/script/dom/url.rs @@ -97,7 +97,7 @@ impl URL { } } -impl URLMethods for URL { +impl URLMethods<crate::DomTypeHolder> for URL { /// <https://url.spec.whatwg.org/#constructors> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/urlsearchparams.rs b/components/script/dom/urlsearchparams.rs index e7bf92e5200..b3712209f25 100644 --- a/components/script/dom/urlsearchparams.rs +++ b/components/script/dom/urlsearchparams.rs @@ -61,7 +61,7 @@ impl URLSearchParams { } } -impl URLSearchParamsMethods for URLSearchParams { +impl URLSearchParamsMethods<crate::DomTypeHolder> for URLSearchParams { /// <https://url.spec.whatwg.org/#dom-urlsearchparams-urlsearchparams> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/validitystate.rs b/components/script/dom/validitystate.rs index 8b2caa5526f..2e50da1a254 100755 --- a/components/script/dom/validitystate.rs +++ b/components/script/dom/validitystate.rs @@ -166,7 +166,7 @@ impl ValidityState { } } -impl ValidityStateMethods for ValidityState { +impl ValidityStateMethods<crate::DomTypeHolder> for ValidityState { // https://html.spec.whatwg.org/multipage/#dom-validitystate-valuemissing fn ValueMissing(&self) -> bool { self.invalid_flags() diff --git a/components/script/dom/videotrack.rs b/components/script/dom/videotrack.rs index 65003ed74df..d417a246541 100644 --- a/components/script/dom/videotrack.rs +++ b/components/script/dom/videotrack.rs @@ -85,7 +85,7 @@ impl VideoTrack { } } -impl VideoTrackMethods for VideoTrack { +impl VideoTrackMethods<crate::DomTypeHolder> for VideoTrack { // https://html.spec.whatwg.org/multipage/#dom-videotrack-id fn Id(&self) -> DOMString { self.id() diff --git a/components/script/dom/videotracklist.rs b/components/script/dom/videotracklist.rs index 5c2f852dc7d..465fc7a705f 100644 --- a/components/script/dom/videotracklist.rs +++ b/components/script/dom/videotracklist.rs @@ -125,7 +125,7 @@ impl VideoTrackList { } } -impl VideoTrackListMethods for VideoTrackList { +impl VideoTrackListMethods<crate::DomTypeHolder> for VideoTrackList { // https://html.spec.whatwg.org/multipage/#dom-videotracklist-length fn Length(&self) -> u32 { self.len() as u32 diff --git a/components/script/dom/visibilitystateentry.rs b/components/script/dom/visibilitystateentry.rs index c08eac70b56..8d150a369da 100644 --- a/components/script/dom/visibilitystateentry.rs +++ b/components/script/dom/visibilitystateentry.rs @@ -55,7 +55,7 @@ impl VisibilityStateEntry { } } -impl VisibilityStateEntryMethods for VisibilityStateEntry { +impl VisibilityStateEntryMethods<crate::DomTypeHolder> for VisibilityStateEntry { /// <https://html.spec.whatwg.org/multipage/#visibilitystateentry-name> fn Name(&self) -> DOMString { self.entry.Name() diff --git a/components/script/dom/vttcue.rs b/components/script/dom/vttcue.rs index f97854dcc21..3c1b484ed09 100644 --- a/components/script/dom/vttcue.rs +++ b/components/script/dom/vttcue.rs @@ -78,7 +78,7 @@ impl VTTCue { } } -impl VTTCueMethods for VTTCue { +impl VTTCueMethods<crate::DomTypeHolder> for VTTCue { // https://w3c.github.io/webvtt/#dom-vttcue-vttcue fn Constructor( window: &Window, diff --git a/components/script/dom/vttregion.rs b/components/script/dom/vttregion.rs index 1280c3c9d88..58a72f13544 100644 --- a/components/script/dom/vttregion.rs +++ b/components/script/dom/vttregion.rs @@ -51,7 +51,7 @@ impl VTTRegion { } } -impl VTTRegionMethods for VTTRegion { +impl VTTRegionMethods<crate::DomTypeHolder> for VTTRegion { // https://w3c.github.io/webvtt/#dom-vttregion-vttregion fn Constructor( window: &Window, diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl2renderingcontext.rs index 0b6b1a22e44..80a73014ebc 100644 --- a/components/script/dom/webgl2renderingcontext.rs +++ b/components/script/dom/webgl2renderingcontext.rs @@ -913,7 +913,7 @@ impl WebGL2RenderingContext { } } -impl WebGL2RenderingContextMethods for WebGL2RenderingContext { +impl WebGL2RenderingContextMethods<crate::DomTypeHolder> for WebGL2RenderingContext { /// <https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1> fn Canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas { self.base.Canvas() diff --git a/components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs b/components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs index 5c79a692adb..becfac57266 100644 --- a/components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs +++ b/components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs @@ -62,7 +62,7 @@ impl WebGLExtension for ANGLEInstancedArrays { } } -impl ANGLEInstancedArraysMethods for ANGLEInstancedArrays { +impl ANGLEInstancedArraysMethods<crate::DomTypeHolder> for ANGLEInstancedArrays { // https://www.khronos.org/registry/webgl/extensions/ANGLE_instanced_arrays/ fn DrawArraysInstancedANGLE(&self, mode: u32, first: i32, count: i32, primcount: i32) { handle_potential_webgl_error!( diff --git a/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs b/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs index 4ddb5c2fb52..7edabae4b73 100644 --- a/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs +++ b/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs @@ -29,7 +29,7 @@ impl OESVertexArrayObject { } } -impl OESVertexArrayObjectMethods for OESVertexArrayObject { +impl OESVertexArrayObjectMethods<crate::DomTypeHolder> for OESVertexArrayObject { // https://www.khronos.org/registry/webgl/extensions/OES_vertex_array_object/ fn CreateVertexArrayOES(&self) -> Option<DomRoot<WebGLVertexArrayObjectOES>> { self.ctx.create_vertex_array() diff --git a/components/script/dom/webglactiveinfo.rs b/components/script/dom/webglactiveinfo.rs index 80815357b8e..0a8a5b87f68 100644 --- a/components/script/dom/webglactiveinfo.rs +++ b/components/script/dom/webglactiveinfo.rs @@ -38,7 +38,7 @@ impl WebGLActiveInfo { } } -impl WebGLActiveInfoMethods for WebGLActiveInfo { +impl WebGLActiveInfoMethods<crate::DomTypeHolder> for WebGLActiveInfo { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.11.1 fn Size(&self) -> i32 { self.size diff --git a/components/script/dom/webglcontextevent.rs b/components/script/dom/webglcontextevent.rs index 8a0c55ff583..f8773c82224 100644 --- a/components/script/dom/webglcontextevent.rs +++ b/components/script/dom/webglcontextevent.rs @@ -25,7 +25,7 @@ pub struct WebGLContextEvent { status_message: DOMString, } -impl WebGLContextEventMethods for WebGLContextEvent { +impl WebGLContextEventMethods<crate::DomTypeHolder> for WebGLContextEvent { // https://registry.khronos.org/webgl/specs/latest/1.0/#5.15 fn Constructor( window: &Window, diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webglobject.rs index 919bfc5cda7..3eb03ce4620 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webglobject.rs @@ -33,7 +33,7 @@ impl WebGLObject { } } -impl WebGLObjectMethods for WebGLObject { +impl WebGLObjectMethods<crate::DomTypeHolder> for WebGLObject { /// <https://registry.khronos.org/webgl/specs/latest/1.0/#5.3> fn Label(&self) -> USVString { self.label.borrow().clone() diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs index 7751bce87ce..215f076c229 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webglrenderingcontext.rs @@ -1994,7 +1994,7 @@ impl Drop for WebGLRenderingContext { } } -impl WebGLRenderingContextMethods for WebGLRenderingContext { +impl WebGLRenderingContextMethods<crate::DomTypeHolder> for WebGLRenderingContext { // https://www.khronos.org/registry/webgl/specs/latest/1.0/#5.14.1 fn Canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas { self.canvas.clone() diff --git a/components/script/dom/webglshaderprecisionformat.rs b/components/script/dom/webglshaderprecisionformat.rs index b65a92b1939..d3abe48a8b9 100644 --- a/components/script/dom/webglshaderprecisionformat.rs +++ b/components/script/dom/webglshaderprecisionformat.rs @@ -45,7 +45,7 @@ impl WebGLShaderPrecisionFormat { } } -impl WebGLShaderPrecisionFormatMethods for WebGLShaderPrecisionFormat { +impl WebGLShaderPrecisionFormatMethods<crate::DomTypeHolder> for WebGLShaderPrecisionFormat { // https://www.khronos.org/registry/webgl/specs/1.0/#5.12.1 fn RangeMin(&self) -> i32 { self.range_min diff --git a/components/script/dom/websocket.rs b/components/script/dom/websocket.rs index 745782c061d..6a97ec7a602 100644 --- a/components/script/dom/websocket.rs +++ b/components/script/dom/websocket.rs @@ -191,7 +191,7 @@ impl WebSocket { } } -impl WebSocketMethods for WebSocket { +impl WebSocketMethods<crate::DomTypeHolder> for WebSocket { /// <https://html.spec.whatwg.org/multipage/#dom-websocket> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/wheelevent.rs b/components/script/dom/wheelevent.rs index 6b08723c339..a81406d43a6 100644 --- a/components/script/dom/wheelevent.rs +++ b/components/script/dom/wheelevent.rs @@ -101,7 +101,7 @@ impl WheelEvent { } } -impl WheelEventMethods for WheelEvent { +impl WheelEventMethods<crate::DomTypeHolder> for WheelEvent { // https://w3c.github.io/uievents/#dom-wheelevent-wheelevent fn Constructor( window: &Window, diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index d065e41e7e1..d7ac58667f0 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -625,7 +625,7 @@ pub fn base64_atob(input: DOMString) -> Fallible<DOMString> { Ok(data.iter().map(|&b| b as char).collect::<String>().into()) } -impl WindowMethods for Window { +impl WindowMethods<crate::DomTypeHolder> for Window { // https://html.spec.whatwg.org/multipage/#dom-alert fn Alert_(&self) { self.Alert(DOMString::new()); diff --git a/components/script/dom/worker.rs b/components/script/dom/worker.rs index 94a23496596..7a407635bca 100644 --- a/components/script/dom/worker.rs +++ b/components/script/dom/worker.rs @@ -157,7 +157,7 @@ impl Worker { } } -impl WorkerMethods for Worker { +impl WorkerMethods<crate::DomTypeHolder> for Worker { // https://html.spec.whatwg.org/multipage/#dom-worker #[allow(unsafe_code)] fn Constructor( diff --git a/components/script/dom/workerglobalscope.rs b/components/script/dom/workerglobalscope.rs index f441f4265c6..fc896810e9d 100644 --- a/components/script/dom/workerglobalscope.rs +++ b/components/script/dom/workerglobalscope.rs @@ -242,7 +242,7 @@ impl WorkerGlobalScope { } } -impl WorkerGlobalScopeMethods for WorkerGlobalScope { +impl WorkerGlobalScopeMethods<crate::DomTypeHolder> for WorkerGlobalScope { // https://html.spec.whatwg.org/multipage/#dom-workerglobalscope-self fn Self_(&self) -> DomRoot<WorkerGlobalScope> { DomRoot::from_ref(self) diff --git a/components/script/dom/workerlocation.rs b/components/script/dom/workerlocation.rs index d69dcc804c1..84afb2699d8 100644 --- a/components/script/dom/workerlocation.rs +++ b/components/script/dom/workerlocation.rs @@ -39,7 +39,7 @@ impl WorkerLocation { } } -impl WorkerLocationMethods for WorkerLocation { +impl WorkerLocationMethods<crate::DomTypeHolder> for WorkerLocation { // https://html.spec.whatwg.org/multipage/#dom-workerlocation-hash fn Hash(&self) -> USVString { UrlHelper::Hash(&self.url) diff --git a/components/script/dom/workernavigator.rs b/components/script/dom/workernavigator.rs index 795c764b8c6..b2c84137fce 100644 --- a/components/script/dom/workernavigator.rs +++ b/components/script/dom/workernavigator.rs @@ -39,7 +39,7 @@ impl WorkerNavigator { } } -impl WorkerNavigatorMethods for WorkerNavigator { +impl WorkerNavigatorMethods<crate::DomTypeHolder> for WorkerNavigator { // https://html.spec.whatwg.org/multipage/#dom-navigator-product fn Product(&self) -> DOMString { navigatorinfo::Product() diff --git a/components/script/dom/worklet.rs b/components/script/dom/worklet.rs index ae6f6777523..2a9058ca9a1 100644 --- a/components/script/dom/worklet.rs +++ b/components/script/dom/worklet.rs @@ -116,7 +116,7 @@ impl Worklet { } } -impl WorkletMethods for Worklet { +impl WorkletMethods<crate::DomTypeHolder> for Worklet { /// <https://drafts.css-houdini.org/worklets/#dom-worklet-addmodule> fn AddModule( &self, diff --git a/components/script/dom/xmldocument.rs b/components/script/dom/xmldocument.rs index 627e0427a6a..a242d113a33 100644 --- a/components/script/dom/xmldocument.rs +++ b/components/script/dom/xmldocument.rs @@ -96,7 +96,7 @@ impl XMLDocument { } } -impl XMLDocumentMethods for XMLDocument { +impl XMLDocumentMethods<crate::DomTypeHolder> for XMLDocument { // https://html.spec.whatwg.org/multipage/#dom-document-location fn GetLocation(&self) -> Option<DomRoot<Location>> { self.upcast::<Document>().GetLocation() diff --git a/components/script/dom/xmlhttprequest.rs b/components/script/dom/xmlhttprequest.rs index da2cffe4cb6..24ba2586ed3 100644 --- a/components/script/dom/xmlhttprequest.rs +++ b/components/script/dom/xmlhttprequest.rs @@ -307,7 +307,7 @@ impl XMLHttpRequest { } } -impl XMLHttpRequestMethods for XMLHttpRequest { +impl XMLHttpRequestMethods<crate::DomTypeHolder> for XMLHttpRequest { /// <https://xhr.spec.whatwg.org/#constructors> fn Constructor( global: &GlobalScope, diff --git a/components/script/dom/xmlhttprequesteventtarget.rs b/components/script/dom/xmlhttprequesteventtarget.rs index af33da13b0c..3cbc648c6f0 100644 --- a/components/script/dom/xmlhttprequesteventtarget.rs +++ b/components/script/dom/xmlhttprequesteventtarget.rs @@ -20,7 +20,7 @@ impl XMLHttpRequestEventTarget { } } -impl XMLHttpRequestEventTargetMethods for XMLHttpRequestEventTarget { +impl XMLHttpRequestEventTargetMethods<crate::DomTypeHolder> for XMLHttpRequestEventTarget { // https://xhr.spec.whatwg.org/#handler-xhr-onloadstart event_handler!(loadstart, GetOnloadstart, SetOnloadstart); diff --git a/components/script/dom/xmlserializer.rs b/components/script/dom/xmlserializer.rs index 948c9013fea..f9d616ebf10 100644 --- a/components/script/dom/xmlserializer.rs +++ b/components/script/dom/xmlserializer.rs @@ -43,7 +43,7 @@ impl XMLSerializer { } } -impl XMLSerializerMethods for XMLSerializer { +impl XMLSerializerMethods<crate::DomTypeHolder> for XMLSerializer { // https://w3c.github.io/DOM-Parsing/#dom-xmlserializer fn Constructor( window: &Window, diff --git a/components/script/dom/xrboundedreferencespace.rs b/components/script/dom/xrboundedreferencespace.rs index 87c267152c1..1434e23e6e1 100644 --- a/components/script/dom/xrboundedreferencespace.rs +++ b/components/script/dom/xrboundedreferencespace.rs @@ -65,7 +65,7 @@ impl XRBoundedReferenceSpace { } } -impl XRBoundedReferenceSpaceMethods for XRBoundedReferenceSpace { +impl XRBoundedReferenceSpaceMethods<crate::DomTypeHolder> for XRBoundedReferenceSpace { /// <https://www.w3.org/TR/webxr/#dom-xrboundedreferencespace-boundsgeometry> fn BoundsGeometry(&self, cx: JSContext, can_gc: CanGc, retval: MutableHandleValue) { if let Some(bounds) = self.reference_space.get_bounds() { diff --git a/components/script/dom/xrframe.rs b/components/script/dom/xrframe.rs index bda3cfea978..f3a8a263fd3 100644 --- a/components/script/dom/xrframe.rs +++ b/components/script/dom/xrframe.rs @@ -75,7 +75,7 @@ impl XRFrame { } } -impl XRFrameMethods for XRFrame { +impl XRFrameMethods<crate::DomTypeHolder> for XRFrame { /// <https://immersive-web.github.io/webxr/#dom-xrframe-session> fn Session(&self) -> DomRoot<XRSession> { DomRoot::from_ref(&self.session) diff --git a/components/script/dom/xrhand.rs b/components/script/dom/xrhand.rs index 8362cda4d86..b73e9cddb35 100644 --- a/components/script/dom/xrhand.rs +++ b/components/script/dom/xrhand.rs @@ -134,7 +134,7 @@ impl XRHand { } } -impl XRHandMethods for XRHand { +impl XRHandMethods<crate::DomTypeHolder> for XRHand { /// <https://github.com/immersive-web/webxr-hands-input/blob/master/explainer.md> fn Size(&self) -> u32 { XRHandJoint::Pinky_finger_tip as u32 + 1 diff --git a/components/script/dom/xrhittestresult.rs b/components/script/dom/xrhittestresult.rs index eaed1ddb21c..faca7dad3a3 100644 --- a/components/script/dom/xrhittestresult.rs +++ b/components/script/dom/xrhittestresult.rs @@ -44,7 +44,7 @@ impl XRHitTestResult { } } -impl XRHitTestResultMethods for XRHitTestResult { +impl XRHitTestResultMethods<crate::DomTypeHolder> for XRHitTestResult { // https://immersive-web.github.io/hit-test/#dom-xrhittestresult-getpose fn GetPose(&self, base: &XRSpace, can_gc: CanGc) -> Option<DomRoot<XRPose>> { let base = self.frame.get_pose(base)?; diff --git a/components/script/dom/xrhittestsource.rs b/components/script/dom/xrhittestsource.rs index d816a4415db..5210bfa84a9 100644 --- a/components/script/dom/xrhittestsource.rs +++ b/components/script/dom/xrhittestsource.rs @@ -45,7 +45,7 @@ impl XRHitTestSource { } } -impl XRHitTestSourceMethods for XRHitTestSource { +impl XRHitTestSourceMethods<crate::DomTypeHolder> for XRHitTestSource { // https://immersive-web.github.io/hit-test/#dom-xrhittestsource-cancel fn Cancel(&self) { self.session.with_session(|s| s.cancel_hit_test(self.id)); diff --git a/components/script/dom/xrinputsource.rs b/components/script/dom/xrinputsource.rs index abbb65bdc9b..c7155d343d2 100644 --- a/components/script/dom/xrinputsource.rs +++ b/components/script/dom/xrinputsource.rs @@ -120,7 +120,7 @@ impl XRInputSource { } } -impl XRInputSourceMethods for XRInputSource { +impl XRInputSourceMethods<crate::DomTypeHolder> for XRInputSource { /// <https://immersive-web.github.io/webxr/#dom-xrinputsource-handedness> fn Handedness(&self) -> XRHandedness { match self.info.handedness { diff --git a/components/script/dom/xrinputsourcearray.rs b/components/script/dom/xrinputsourcearray.rs index be9e5ab78dd..18059db822a 100644 --- a/components/script/dom/xrinputsourcearray.rs +++ b/components/script/dom/xrinputsourcearray.rs @@ -136,7 +136,7 @@ impl XRInputSourceArray { } } -impl XRInputSourceArrayMethods for XRInputSourceArray { +impl XRInputSourceArrayMethods<crate::DomTypeHolder> for XRInputSourceArray { /// <https://immersive-web.github.io/webxr/#dom-xrinputsourcearray-length> fn Length(&self) -> u32 { self.input_sources.borrow().len() as u32 diff --git a/components/script/dom/xrinputsourceevent.rs b/components/script/dom/xrinputsourceevent.rs index 701b5d26cb8..cc694f8f99c 100644 --- a/components/script/dom/xrinputsourceevent.rs +++ b/components/script/dom/xrinputsourceevent.rs @@ -78,7 +78,7 @@ impl XRInputSourceEvent { } } -impl XRInputSourceEventMethods for XRInputSourceEvent { +impl XRInputSourceEventMethods<crate::DomTypeHolder> for XRInputSourceEvent { // https://immersive-web.github.io/webxr/#dom-xrinputsourceevent-xrinputsourceevent fn Constructor( window: &Window, diff --git a/components/script/dom/xrinputsourceschangeevent.rs b/components/script/dom/xrinputsourceschangeevent.rs index 1ae14b3a47c..4429f7d545e 100644 --- a/components/script/dom/xrinputsourceschangeevent.rs +++ b/components/script/dom/xrinputsourceschangeevent.rs @@ -96,7 +96,7 @@ impl XRInputSourcesChangeEvent { } } -impl XRInputSourcesChangeEventMethods for XRInputSourcesChangeEvent { +impl XRInputSourcesChangeEventMethods<crate::DomTypeHolder> for XRInputSourcesChangeEvent { // https://immersive-web.github.io/webxr/#dom-xrinputsourceschangeevent-xrinputsourceschangeevent fn Constructor( window: &Window, diff --git a/components/script/dom/xrjointpose.rs b/components/script/dom/xrjointpose.rs index 9a3e60bab33..9d1ed301486 100644 --- a/components/script/dom/xrjointpose.rs +++ b/components/script/dom/xrjointpose.rs @@ -43,7 +43,7 @@ impl XRJointPose { } } -impl XRJointPoseMethods for XRJointPose { +impl XRJointPoseMethods<crate::DomTypeHolder> for XRJointPose { /// <https://immersive-web.github.io/webxr/#dom-XRJointPose-views> fn GetRadius(&self) -> Option<Finite<f32>> { self.radius.map(Finite::wrap) diff --git a/components/script/dom/xrjointspace.rs b/components/script/dom/xrjointspace.rs index 36771f289b9..8d8dc9309f7 100644 --- a/components/script/dom/xrjointspace.rs +++ b/components/script/dom/xrjointspace.rs @@ -75,7 +75,7 @@ impl XRJointSpace { } } -impl XRJointSpaceMethods for XRJointSpace { +impl XRJointSpaceMethods<crate::DomTypeHolder> for XRJointSpace { /// <https://www.w3.org/TR/webxr-hand-input-1/#xrjointspace-jointname> fn JointName(&self) -> XRHandJoint { self.hand_joint diff --git a/components/script/dom/xrlayerevent.rs b/components/script/dom/xrlayerevent.rs index 763c9245903..136aac87450 100644 --- a/components/script/dom/xrlayerevent.rs +++ b/components/script/dom/xrlayerevent.rs @@ -48,7 +48,7 @@ impl XRLayerEvent { } } -impl XRLayerEventMethods for XRLayerEvent { +impl XRLayerEventMethods<crate::DomTypeHolder> for XRLayerEvent { // https://immersive-web.github.io/layers/#dom-xrlayerevent-xrlayerevent fn Constructor( window: &Window, diff --git a/components/script/dom/xrmediabinding.rs b/components/script/dom/xrmediabinding.rs index 214d0e31d0e..14eec1fb354 100644 --- a/components/script/dom/xrmediabinding.rs +++ b/components/script/dom/xrmediabinding.rs @@ -47,7 +47,7 @@ impl XRMediaBinding { } } -impl XRMediaBindingMethods for XRMediaBinding { +impl XRMediaBindingMethods<crate::DomTypeHolder> for XRMediaBinding { /// <https://immersive-web.github.io/layers/#dom-xrmediabinding-xrmediabinding> fn Constructor( global: &Window, diff --git a/components/script/dom/xrpose.rs b/components/script/dom/xrpose.rs index be82e52c1a6..dea8aa62dc4 100644 --- a/components/script/dom/xrpose.rs +++ b/components/script/dom/xrpose.rs @@ -38,7 +38,7 @@ impl XRPose { } } -impl XRPoseMethods for XRPose { +impl XRPoseMethods<crate::DomTypeHolder> for XRPose { /// <https://immersive-web.github.io/webxr/#dom-xrpose-transform> fn Transform(&self) -> DomRoot<XRRigidTransform> { DomRoot::from_ref(&self.transform) diff --git a/components/script/dom/xrray.rs b/components/script/dom/xrray.rs index 52be024a027..d80a4c00d61 100644 --- a/components/script/dom/xrray.rs +++ b/components/script/dom/xrray.rs @@ -53,7 +53,7 @@ impl XRRay { } } -impl XRRayMethods for XRRay { +impl XRRayMethods<crate::DomTypeHolder> for XRRay { /// <https://immersive-web.github.io/hit-test/#dom-xrray-xrray> fn Constructor( window: &Window, diff --git a/components/script/dom/xrreferencespace.rs b/components/script/dom/xrreferencespace.rs index 05b1d1c5636..6f8c409edbc 100644 --- a/components/script/dom/xrreferencespace.rs +++ b/components/script/dom/xrreferencespace.rs @@ -79,7 +79,7 @@ impl XRReferenceSpace { } } -impl XRReferenceSpaceMethods for XRReferenceSpace { +impl XRReferenceSpaceMethods<crate::DomTypeHolder> for XRReferenceSpace { /// <https://immersive-web.github.io/webxr/#dom-xrreferencespace-getoffsetreferencespace> fn GetOffsetReferenceSpace(&self, new: &XRRigidTransform, can_gc: CanGc) -> DomRoot<Self> { let offset = new.transform().then(&self.offset.transform()); diff --git a/components/script/dom/xrreferencespaceevent.rs b/components/script/dom/xrreferencespaceevent.rs index e31c1da0903..e75aabe14a1 100644 --- a/components/script/dom/xrreferencespaceevent.rs +++ b/components/script/dom/xrreferencespaceevent.rs @@ -81,7 +81,7 @@ impl XRReferenceSpaceEvent { } } -impl XRReferenceSpaceEventMethods for XRReferenceSpaceEvent { +impl XRReferenceSpaceEventMethods<crate::DomTypeHolder> for XRReferenceSpaceEvent { /// <https://www.w3.org/TR/webxr/#dom-xrreferencespaceevent-xrreferencespaceevent> fn Constructor( window: &Window, diff --git a/components/script/dom/xrrenderstate.rs b/components/script/dom/xrrenderstate.rs index e189710ead2..cf6976404d6 100644 --- a/components/script/dom/xrrenderstate.rs +++ b/components/script/dom/xrrenderstate.rs @@ -124,7 +124,7 @@ impl XRRenderState { } } -impl XRRenderStateMethods for XRRenderState { +impl XRRenderStateMethods<crate::DomTypeHolder> for XRRenderState { /// <https://immersive-web.github.io/webxr/#dom-xrrenderstate-depthnear> fn DepthNear(&self) -> Finite<f64> { Finite::wrap(self.depth_near.get()) diff --git a/components/script/dom/xrrigidtransform.rs b/components/script/dom/xrrigidtransform.rs index 85849fe7f80..fda4332eb0b 100644 --- a/components/script/dom/xrrigidtransform.rs +++ b/components/script/dom/xrrigidtransform.rs @@ -72,7 +72,7 @@ impl XRRigidTransform { } } -impl XRRigidTransformMethods for XRRigidTransform { +impl XRRigidTransformMethods<crate::DomTypeHolder> for XRRigidTransform { // https://immersive-web.github.io/webxr/#dom-xrrigidtransform-xrrigidtransform fn Constructor( window: &Window, diff --git a/components/script/dom/xrsession.rs b/components/script/dom/xrsession.rs index 6ba00e003a7..3bbe6537bb9 100644 --- a/components/script/dom/xrsession.rs +++ b/components/script/dom/xrsession.rs @@ -619,7 +619,7 @@ impl XRSession { } } -impl XRSessionMethods for XRSession { +impl XRSessionMethods<crate::DomTypeHolder> for XRSession { // https://immersive-web.github.io/webxr/#eventdef-xrsession-end event_handler!(end, GetOnend, SetOnend); diff --git a/components/script/dom/xrsessionevent.rs b/components/script/dom/xrsessionevent.rs index b253f7aa320..fda299a9f2a 100644 --- a/components/script/dom/xrsessionevent.rs +++ b/components/script/dom/xrsessionevent.rs @@ -68,7 +68,7 @@ impl XRSessionEvent { } } -impl XRSessionEventMethods for XRSessionEvent { +impl XRSessionEventMethods<crate::DomTypeHolder> for XRSessionEvent { // https://immersive-web.github.io/webxr/#dom-xrsessionevent-xrsessionevent fn Constructor( window: &Window, diff --git a/components/script/dom/xrsubimage.rs b/components/script/dom/xrsubimage.rs index e16e18bbaf2..53d2e3ca697 100644 --- a/components/script/dom/xrsubimage.rs +++ b/components/script/dom/xrsubimage.rs @@ -15,7 +15,7 @@ pub struct XRSubImage { viewport: Dom<XRViewport>, } -impl XRSubImageMethods for XRSubImage { +impl XRSubImageMethods<crate::DomTypeHolder> for XRSubImage { /// <https://immersive-web.github.io/layers/#dom-xrsubimage-viewport> fn Viewport(&self) -> DomRoot<XRViewport> { DomRoot::from_ref(&self.viewport) diff --git a/components/script/dom/xrsystem.rs b/components/script/dom/xrsystem.rs index d6b3ed259d2..21705357e0b 100644 --- a/components/script/dom/xrsystem.rs +++ b/components/script/dom/xrsystem.rs @@ -110,7 +110,7 @@ impl From<XRSessionMode> for SessionMode { } } -impl XRSystemMethods for XRSystem { +impl XRSystemMethods<crate::DomTypeHolder> for XRSystem { /// <https://immersive-web.github.io/webxr/#dom-xr-issessionsupported> fn IsSessionSupported(&self, mode: XRSessionMode, can_gc: CanGc) -> Rc<Promise> { // XXXManishearth this should select an XR device first diff --git a/components/script/dom/xrtest.rs b/components/script/dom/xrtest.rs index 0f854ad38c6..0117ab5c3ce 100644 --- a/components/script/dom/xrtest.rs +++ b/components/script/dom/xrtest.rs @@ -66,7 +66,7 @@ impl XRTest { } } -impl XRTestMethods for XRTest { +impl XRTestMethods<crate::DomTypeHolder> for XRTest { /// <https://github.com/immersive-web/webxr-test-api/blob/master/explainer.md> #[allow(unsafe_code)] fn SimulateDeviceConnection(&self, init: &FakeXRDeviceInit, can_gc: CanGc) -> Rc<Promise> { diff --git a/components/script/dom/xrview.rs b/components/script/dom/xrview.rs index 275735733f8..b1ef9596401 100644 --- a/components/script/dom/xrview.rs +++ b/components/script/dom/xrview.rs @@ -87,7 +87,7 @@ impl XRView { } } -impl XRViewMethods for XRView { +impl XRViewMethods<crate::DomTypeHolder> for XRView { /// <https://immersive-web.github.io/webxr/#dom-xrview-eye> fn Eye(&self) -> XREye { self.eye diff --git a/components/script/dom/xrviewerpose.rs b/components/script/dom/xrviewerpose.rs index 9c8774c7855..47b166ab375 100644 --- a/components/script/dom/xrviewerpose.rs +++ b/components/script/dom/xrviewerpose.rs @@ -188,7 +188,7 @@ impl XRViewerPose { } } -impl XRViewerPoseMethods for XRViewerPose { +impl XRViewerPoseMethods<crate::DomTypeHolder> for XRViewerPose { /// <https://immersive-web.github.io/webxr/#dom-xrviewerpose-views> fn Views(&self, _cx: JSContext, mut retval: MutableHandleValue) { retval.set(self.views.get()) diff --git a/components/script/dom/xrviewport.rs b/components/script/dom/xrviewport.rs index 5a98c7839c0..8ac28519620 100644 --- a/components/script/dom/xrviewport.rs +++ b/components/script/dom/xrviewport.rs @@ -31,7 +31,7 @@ impl XRViewport { } } -impl XRViewportMethods for XRViewport { +impl XRViewportMethods<crate::DomTypeHolder> for XRViewport { /// <https://immersive-web.github.io/webxr/#dom-xrviewport-x> fn X(&self) -> i32 { self.viewport.origin.x diff --git a/components/script/dom/xrwebglbinding.rs b/components/script/dom/xrwebglbinding.rs index 145937c0227..c2d652bb81d 100644 --- a/components/script/dom/xrwebglbinding.rs +++ b/components/script/dom/xrwebglbinding.rs @@ -62,7 +62,7 @@ impl XRWebGLBinding { } } -impl XRWebGLBindingMethods for XRWebGLBinding { +impl XRWebGLBindingMethods<crate::DomTypeHolder> for XRWebGLBinding { /// <https://immersive-web.github.io/layers/#dom-xrwebglbinding-xrwebglbinding> fn Constructor( global: &Window, diff --git a/components/script/dom/xrwebgllayer.rs b/components/script/dom/xrwebgllayer.rs index 3812c8df2ea..031bd4b2f4d 100644 --- a/components/script/dom/xrwebgllayer.rs +++ b/components/script/dom/xrwebgllayer.rs @@ -237,7 +237,7 @@ impl XRWebGLLayer { } } -impl XRWebGLLayerMethods for XRWebGLLayer { +impl XRWebGLLayerMethods<crate::DomTypeHolder> for XRWebGLLayer { /// <https://immersive-web.github.io/webxr/#dom-xrwebgllayer-xrwebgllayer> fn Constructor( global: &Window, diff --git a/components/script/dom/xrwebglsubimage.rs b/components/script/dom/xrwebglsubimage.rs index 6a224e25839..acdcd22f4a9 100644 --- a/components/script/dom/xrwebglsubimage.rs +++ b/components/script/dom/xrwebglsubimage.rs @@ -21,7 +21,7 @@ pub struct XRWebGLSubImage { size: Size2D<u32, Viewport>, } -impl XRWebGLSubImageMethods for XRWebGLSubImage { +impl XRWebGLSubImageMethods<crate::DomTypeHolder> for XRWebGLSubImage { /// <https://immersive-web.github.io/layers/#dom-xrwebglsubimage-colortexture> fn ColorTexture(&self) -> DomRoot<WebGLTexture> { DomRoot::from_ref(&self.color_texture) diff --git a/components/script/lib.rs b/components/script/lib.rs index 043f3fe2b4e..42f3d2c0c4c 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -101,6 +101,8 @@ mod links; pub use init::init; pub use script_runtime::JSEngineSetup; +pub use crate::dom::bindings::codegen::DomTypeHolder::DomTypeHolder; +pub use crate::dom::bindings::codegen::DomTypes::DomTypes; // These trait exports are public, because they are used in the DOM bindings. // Since they are used in derive macros, // it is useful that they are accessible at the root of the crate. |