diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 058ea99bc8f..fbd97e82c2f 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -188,7 +188,7 @@ use crate::dom::trustedhtml::TrustedHTML; use crate::dom::types::VisibilityStateEntry; use crate::dom::uievent::UIEvent; use crate::dom::virtualmethods::vtable_for; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; #[cfg(feature = "webgpu")] use crate::dom::webgpu::gpucanvascontext::GPUCanvasContext; use crate::dom::window::Window; diff --git a/components/script/dom/htmlcanvaselement.rs b/components/script/dom/htmlcanvaselement.rs index 19ffbf41e5d..a913bce6dc2 100644 --- a/components/script/dom/htmlcanvaselement.rs +++ b/components/script/dom/htmlcanvaselement.rs @@ -58,8 +58,8 @@ use crate::dom::node::{Node, NodeTraits}; use crate::dom::offscreencanvas::OffscreenCanvas; use crate::dom::values::UNSIGNED_LONG_MAX; use crate::dom::virtualmethods::VirtualMethods; -use crate::dom::webgl2renderingcontext::WebGL2RenderingContext; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgl2renderingcontext::WebGL2RenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; #[cfg(feature = "webgpu")] use crate::dom::webgpu::gpucanvascontext::GPUCanvasContext; use crate::script_runtime::{CanGc, JSContext}; diff --git a/components/script/dom/mod.rs b/components/script/dom/mod.rs index 881656b51ae..137419177d2 100644 --- a/components/script/dom/mod.rs +++ b/components/script/dom/mod.rs @@ -602,34 +602,15 @@ pub(crate) mod userscripts; pub(crate) mod validation; pub(crate) mod validitystate; pub(crate) mod values; -pub(crate) mod vertexarrayobject; pub(crate) mod videotrack; pub(crate) mod videotracklist; pub(crate) mod virtualmethods; pub(crate) mod visibilitystateentry; pub(crate) mod vttcue; pub(crate) mod vttregion; -pub(crate) mod webgl2renderingcontext; -pub(crate) mod webgl_extensions; -pub(crate) mod webgl_validations; -pub(crate) mod webglactiveinfo; -pub(crate) mod webglbuffer; -pub(crate) mod webglcontextevent; -pub(crate) mod webglframebuffer; -pub(crate) mod webglobject; -pub(crate) mod webglprogram; -pub(crate) mod webglquery; -pub(crate) mod webglrenderbuffer; -pub(crate) mod webglrenderingcontext; -pub(crate) mod webglsampler; -pub(crate) mod webglshader; -pub(crate) mod webglshaderprecisionformat; -pub(crate) mod webglsync; -pub(crate) mod webgltexture; -pub(crate) mod webgltransformfeedback; -pub(crate) mod webgluniformlocation; -pub(crate) mod webglvertexarrayobject; -pub(crate) mod webglvertexarrayobjectoes; +pub(crate) mod webgl; +pub(crate) use self::webgl::extensions::ext::*; +pub(crate) use self::webgl::*; pub(crate) mod websocket; #[cfg(feature = "webxr")] mod webxr; @@ -666,4 +647,3 @@ pub(crate) mod xmlserializer; pub(crate) mod xpathevaluator; pub(crate) mod xpathexpression; pub(crate) mod xpathresult; -pub(crate) use self::webgl_extensions::ext::*; diff --git a/components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs b/components/script/dom/webgl/extensions/ext/angleinstancedarrays.rs similarity index 97% rename from components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs rename to components/script/dom/webgl/extensions/ext/angleinstancedarrays.rs index 4d42beaa8ae..2bbb23baade 100644 --- a/components/script/dom/webgl_extensions/ext/angleinstancedarrays.rs +++ b/components/script/dom/webgl/extensions/ext/angleinstancedarrays.rs @@ -11,7 +11,7 @@ use crate::dom::bindings::codegen::Bindings::ANGLEInstancedArraysBinding::{ }; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/extblendminmax.rs b/components/script/dom/webgl/extensions/ext/extblendminmax.rs similarity index 95% rename from components/script/dom/webgl_extensions/ext/extblendminmax.rs rename to components/script/dom/webgl/extensions/ext/extblendminmax.rs index 1d728f5818f..811b361da64 100644 --- a/components/script/dom/webgl_extensions/ext/extblendminmax.rs +++ b/components/script/dom/webgl/extensions/ext/extblendminmax.rs @@ -8,7 +8,7 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/extcolorbufferhalffloat.rs b/components/script/dom/webgl/extensions/ext/extcolorbufferhalffloat.rs similarity index 90% rename from components/script/dom/webgl_extensions/ext/extcolorbufferhalffloat.rs rename to components/script/dom/webgl/extensions/ext/extcolorbufferhalffloat.rs index 43305992d6d..53bcf9f7c98 100644 --- a/components/script/dom/webgl_extensions/ext/extcolorbufferhalffloat.rs +++ b/components/script/dom/webgl/extensions/ext/extcolorbufferhalffloat.rs @@ -8,8 +8,8 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webgl_extensions::ext::oestexturehalffloat::OESTextureHalfFloat; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::extensions::oestexturehalffloat::OESTextureHalfFloat; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/extfragdepth.rs b/components/script/dom/webgl/extensions/ext/extfragdepth.rs similarity index 96% rename from components/script/dom/webgl_extensions/ext/extfragdepth.rs rename to components/script/dom/webgl/extensions/ext/extfragdepth.rs index 697249ebf83..f530e9acfd5 100644 --- a/components/script/dom/webgl_extensions/ext/extfragdepth.rs +++ b/components/script/dom/webgl/extensions/ext/extfragdepth.rs @@ -8,7 +8,7 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/extshadertexturelod.rs b/components/script/dom/webgl/extensions/ext/extshadertexturelod.rs similarity index 95% rename from components/script/dom/webgl_extensions/ext/extshadertexturelod.rs rename to components/script/dom/webgl/extensions/ext/extshadertexturelod.rs index f4a578d8df7..8aa0abe437c 100644 --- a/components/script/dom/webgl_extensions/ext/extshadertexturelod.rs +++ b/components/script/dom/webgl/extensions/ext/extshadertexturelod.rs @@ -8,7 +8,7 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/exttexturefilteranisotropic.rs b/components/script/dom/webgl/extensions/ext/exttexturefilteranisotropic.rs similarity index 96% rename from components/script/dom/webgl_extensions/ext/exttexturefilteranisotropic.rs rename to components/script/dom/webgl/extensions/ext/exttexturefilteranisotropic.rs index 48128028cd0..dca9b84244e 100644 --- a/components/script/dom/webgl_extensions/ext/exttexturefilteranisotropic.rs +++ b/components/script/dom/webgl/extensions/ext/exttexturefilteranisotropic.rs @@ -9,7 +9,7 @@ use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::codegen::Bindings::EXTTextureFilterAnisotropicBinding::EXTTextureFilterAnisotropicConstants; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/mod.rs b/components/script/dom/webgl/extensions/ext/mod.rs similarity index 100% rename from components/script/dom/webgl_extensions/ext/mod.rs rename to components/script/dom/webgl/extensions/ext/mod.rs diff --git a/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs b/components/script/dom/webgl/extensions/ext/oeselementindexuint.rs similarity index 95% rename from components/script/dom/webgl_extensions/ext/oeselementindexuint.rs rename to components/script/dom/webgl/extensions/ext/oeselementindexuint.rs index 7cbdd717977..6265846dcd2 100644 --- a/components/script/dom/webgl_extensions/ext/oeselementindexuint.rs +++ b/components/script/dom/webgl/extensions/ext/oeselementindexuint.rs @@ -8,7 +8,7 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/oesstandardderivatives.rs b/components/script/dom/webgl/extensions/ext/oesstandardderivatives.rs similarity index 96% rename from components/script/dom/webgl_extensions/ext/oesstandardderivatives.rs rename to components/script/dom/webgl/extensions/ext/oesstandardderivatives.rs index a7ed70ca880..e0295f24eca 100644 --- a/components/script/dom/webgl_extensions/ext/oesstandardderivatives.rs +++ b/components/script/dom/webgl/extensions/ext/oesstandardderivatives.rs @@ -9,7 +9,7 @@ use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::codegen::Bindings::OESStandardDerivativesBinding::OESStandardDerivativesConstants; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/oestexturefloat.rs b/components/script/dom/webgl/extensions/ext/oestexturefloat.rs similarity index 96% rename from components/script/dom/webgl_extensions/ext/oestexturefloat.rs rename to components/script/dom/webgl/extensions/ext/oestexturefloat.rs index 5b0c13fcc7b..3c574b3d505 100644 --- a/components/script/dom/webgl_extensions/ext/oestexturefloat.rs +++ b/components/script/dom/webgl/extensions/ext/oestexturefloat.rs @@ -8,7 +8,7 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions, constants as webgl}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/oestexturefloatlinear.rs b/components/script/dom/webgl/extensions/ext/oestexturefloatlinear.rs similarity index 95% rename from components/script/dom/webgl_extensions/ext/oestexturefloatlinear.rs rename to components/script/dom/webgl/extensions/ext/oestexturefloatlinear.rs index 630ef8b4908..f4eef59dd0b 100644 --- a/components/script/dom/webgl_extensions/ext/oestexturefloatlinear.rs +++ b/components/script/dom/webgl/extensions/ext/oestexturefloatlinear.rs @@ -7,7 +7,7 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions, constants as webgl}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs b/components/script/dom/webgl/extensions/ext/oestexturehalffloat.rs similarity index 97% rename from components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs rename to components/script/dom/webgl/extensions/ext/oestexturehalffloat.rs index b61ca0e1515..c59a61a8584 100644 --- a/components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs +++ b/components/script/dom/webgl/extensions/ext/oestexturehalffloat.rs @@ -9,7 +9,7 @@ use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::codegen::Bindings::OESTextureHalfFloatBinding::OESTextureHalfFloatConstants; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/oestexturehalffloatlinear.rs b/components/script/dom/webgl/extensions/ext/oestexturehalffloatlinear.rs similarity index 96% rename from components/script/dom/webgl_extensions/ext/oestexturehalffloatlinear.rs rename to components/script/dom/webgl/extensions/ext/oestexturehalffloatlinear.rs index b75ad00b522..c84d31003f0 100644 --- a/components/script/dom/webgl_extensions/ext/oestexturehalffloatlinear.rs +++ b/components/script/dom/webgl/extensions/ext/oestexturehalffloatlinear.rs @@ -8,7 +8,7 @@ use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::codegen::Bindings::OESTextureHalfFloatBinding::OESTextureHalfFloatConstants; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs b/components/script/dom/webgl/extensions/ext/oesvertexarrayobject.rs similarity index 95% rename from components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs rename to components/script/dom/webgl/extensions/ext/oesvertexarrayobject.rs index 6ce64d8a73b..8134f8028bb 100644 --- a/components/script/dom/webgl_extensions/ext/oesvertexarrayobject.rs +++ b/components/script/dom/webgl/extensions/ext/oesvertexarrayobject.rs @@ -11,8 +11,8 @@ use crate::dom::bindings::codegen::Bindings::OESVertexArrayObjectBinding::{ }; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webglvertexarrayobjectoes::WebGLVertexArrayObjectOES; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglvertexarrayobjectoes::WebGLVertexArrayObjectOES; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/webglcolorbufferfloat.rs b/components/script/dom/webgl/extensions/ext/webglcolorbufferfloat.rs similarity index 91% rename from components/script/dom/webgl_extensions/ext/webglcolorbufferfloat.rs rename to components/script/dom/webgl/extensions/ext/webglcolorbufferfloat.rs index 3777717b2bc..f0138a1693e 100644 --- a/components/script/dom/webgl_extensions/ext/webglcolorbufferfloat.rs +++ b/components/script/dom/webgl/extensions/ext/webglcolorbufferfloat.rs @@ -8,8 +8,8 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webgl_extensions::ext::oestexturefloat::OESTextureFloat; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::extensions::oestexturefloat::OESTextureFloat; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/webglcompressedtextureetc1.rs b/components/script/dom/webgl/extensions/ext/webglcompressedtextureetc1.rs similarity index 92% rename from components/script/dom/webgl_extensions/ext/webglcompressedtextureetc1.rs rename to components/script/dom/webgl/extensions/ext/webglcompressedtextureetc1.rs index c68841be3bd..e0980fb5cce 100644 --- a/components/script/dom/webgl_extensions/ext/webglcompressedtextureetc1.rs +++ b/components/script/dom/webgl/extensions/ext/webglcompressedtextureetc1.rs @@ -8,8 +8,8 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webgltexture::{TexCompression, TexCompressionValidation}; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgltexture::{TexCompression, TexCompressionValidation}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/ext/webglcompressedtextures3tc.rs b/components/script/dom/webgl/extensions/ext/webglcompressedtextures3tc.rs similarity index 94% rename from components/script/dom/webgl_extensions/ext/webglcompressedtextures3tc.rs rename to components/script/dom/webgl/extensions/ext/webglcompressedtextures3tc.rs index 5a792fad03c..ac397220684 100644 --- a/components/script/dom/webgl_extensions/ext/webglcompressedtextures3tc.rs +++ b/components/script/dom/webgl/extensions/ext/webglcompressedtextures3tc.rs @@ -8,8 +8,8 @@ use dom_struct::dom_struct; use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webgltexture::{TexCompression, TexCompressionValidation}; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgltexture::{TexCompression, TexCompressionValidation}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgl_extensions/extension.rs b/components/script/dom/webgl/extensions/extension.rs similarity index 95% rename from components/script/dom/webgl_extensions/extension.rs rename to components/script/dom/webgl/extensions/extension.rs index a4988179b91..639fde910ea 100644 --- a/components/script/dom/webgl_extensions/extension.rs +++ b/components/script/dom/webgl/extensions/extension.rs @@ -8,7 +8,7 @@ use super::WebGLExtensions; use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::trace::JSTraceable; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; /// Trait implemented by WebGL extensions. diff --git a/components/script/dom/webgl_extensions/extensions.rs b/components/script/dom/webgl/extensions/extensions.rs similarity index 97% rename from components/script/dom/webgl_extensions/extensions.rs rename to components/script/dom/webgl/extensions/extensions.rs index 2874de4cd13..ab93f3b8582 100644 --- a/components/script/dom/webgl_extensions/extensions.rs +++ b/components/script/dom/webgl/extensions/extensions.rs @@ -22,12 +22,12 @@ use crate::dom::bindings::codegen::Bindings::OESTextureHalfFloatBinding::OESText use crate::dom::bindings::codegen::Bindings::OESVertexArrayObjectBinding::OESVertexArrayObjectConstants; use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; use crate::dom::bindings::trace::JSTraceable; -use crate::dom::extcolorbufferhalffloat::EXTColorBufferHalfFloat; -use crate::dom::oestexturefloat::OESTextureFloat; -use crate::dom::oestexturehalffloat::OESTextureHalfFloat; -use crate::dom::webglcolorbufferfloat::WEBGLColorBufferFloat; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webgltexture::TexCompression; +use crate::dom::webgl::extensions::extcolorbufferhalffloat::EXTColorBufferHalfFloat; +use crate::dom::webgl::extensions::oestexturefloat::OESTextureFloat; +use crate::dom::webgl::extensions::oestexturehalffloat::OESTextureHalfFloat; +use crate::dom::webgl::extensions::webglcolorbufferfloat::WEBGLColorBufferFloat; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgltexture::TexCompression; // Data types that are implemented for texImage2D and texSubImage2D in a WebGL 1.0 context // but must trigger a InvalidValue error until the related WebGL Extensions are enabled. diff --git a/components/script/dom/webgl_extensions/mod.rs b/components/script/dom/webgl/extensions/mod.rs similarity index 85% rename from components/script/dom/webgl_extensions/mod.rs rename to components/script/dom/webgl/extensions/mod.rs index 2bcf2c3d679..2dc2b3264e9 100644 --- a/components/script/dom/webgl_extensions/mod.rs +++ b/components/script/dom/webgl/extensions/mod.rs @@ -4,8 +4,10 @@ pub(crate) mod ext; mod extension; +#[allow(clippy::module_inception)] mod extensions; mod wrapper; +pub(crate) use self::ext::*; pub(crate) use self::extension::{WebGLExtension, WebGLExtensionSpec}; pub(crate) use self::extensions::WebGLExtensions; diff --git a/components/script/dom/webgl_extensions/wrapper.rs b/components/script/dom/webgl/extensions/wrapper.rs similarity index 97% rename from components/script/dom/webgl_extensions/wrapper.rs rename to components/script/dom/webgl/extensions/wrapper.rs index 0c68b14cd93..0658674f501 100644 --- a/components/script/dom/webgl_extensions/wrapper.rs +++ b/components/script/dom/webgl/extensions/wrapper.rs @@ -11,7 +11,7 @@ use super::{WebGLExtension, WebGLExtensionSpec, WebGLExtensions}; use crate::dom::bindings::reflector::DomObject; use crate::dom::bindings::root::MutNullableDom; use crate::dom::bindings::trace::JSTraceable; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::script_runtime::CanGc; /// Trait used internally by WebGLExtensions to store and diff --git a/components/script/dom/webgl/mod.rs b/components/script/dom/webgl/mod.rs new file mode 100644 index 00000000000..2b55a4fd9b1 --- /dev/null +++ b/components/script/dom/webgl/mod.rs @@ -0,0 +1,26 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ + +pub(crate) mod extensions; +pub(crate) mod validations; +pub(crate) mod vertexarrayobject; +pub(crate) mod webgl2renderingcontext; +pub(crate) mod webglactiveinfo; +pub(crate) mod webglbuffer; +pub(crate) mod webglcontextevent; +pub(crate) mod webglframebuffer; +pub(crate) mod webglobject; +pub(crate) mod webglprogram; +pub(crate) mod webglquery; +pub(crate) mod webglrenderbuffer; +pub(crate) mod webglrenderingcontext; +pub(crate) mod webglsampler; +pub(crate) mod webglshader; +pub(crate) mod webglshaderprecisionformat; +pub(crate) mod webglsync; +pub(crate) mod webgltexture; +pub(crate) mod webgltransformfeedback; +pub(crate) mod webgluniformlocation; +pub(crate) mod webglvertexarrayobject; +pub(crate) mod webglvertexarrayobjectoes; diff --git a/components/script/dom/webgl_validations/mod.rs b/components/script/dom/webgl/validations/mod.rs similarity index 100% rename from components/script/dom/webgl_validations/mod.rs rename to components/script/dom/webgl/validations/mod.rs diff --git a/components/script/dom/webgl_validations/tex_image_2d.rs b/components/script/dom/webgl/validations/tex_image_2d.rs similarity index 99% rename from components/script/dom/webgl_validations/tex_image_2d.rs rename to components/script/dom/webgl/validations/tex_image_2d.rs index 088c81d5443..a2c2a6e8b96 100644 --- a/components/script/dom/webgl_validations/tex_image_2d.rs +++ b/components/script/dom/webgl/validations/tex_image_2d.rs @@ -10,8 +10,10 @@ use canvas_traits::webgl::{TexDataType, TexFormat}; use super::WebGLValidator; use super::types::TexImageTarget; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webgltexture::{ImageInfo, TexCompression, TexCompressionValidation, WebGLTexture}; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgltexture::{ + ImageInfo, TexCompression, TexCompressionValidation, WebGLTexture, +}; /// The errors that the texImage* family of functions can generate. #[derive(Debug)] diff --git a/components/script/dom/webgl_validations/tex_image_3d.rs b/components/script/dom/webgl/validations/tex_image_3d.rs similarity index 98% rename from components/script/dom/webgl_validations/tex_image_3d.rs rename to components/script/dom/webgl/validations/tex_image_3d.rs index 8b1821a95e1..bbb816a5479 100644 --- a/components/script/dom/webgl_validations/tex_image_3d.rs +++ b/components/script/dom/webgl/validations/tex_image_3d.rs @@ -11,8 +11,8 @@ use super::WebGLValidator; use super::tex_image_2d::TexImageValidationError; use super::types::TexImageTarget; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webgltexture::WebGLTexture; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgltexture::WebGLTexture; fn log2(n: u32) -> u32 { 31 - n.leading_zeros() diff --git a/components/script/dom/webgl_validations/types.rs b/components/script/dom/webgl/validations/types.rs similarity index 100% rename from components/script/dom/webgl_validations/types.rs rename to components/script/dom/webgl/validations/types.rs diff --git a/components/script/dom/vertexarrayobject.rs b/components/script/dom/webgl/vertexarrayobject.rs similarity index 98% rename from components/script/dom/vertexarrayobject.rs rename to components/script/dom/webgl/vertexarrayobject.rs index df1792668c0..dedcefe2e4e 100644 --- a/components/script/dom/vertexarrayobject.rs +++ b/components/script/dom/webgl/vertexarrayobject.rs @@ -12,8 +12,8 @@ use crate::dom::bindings::cell::{DomRefCell, Ref}; use crate::dom::bindings::codegen::Bindings::WebGL2RenderingContextBinding::WebGL2RenderingContextConstants as constants2; use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGLRenderingContextConstants as constants; use crate::dom::bindings::root::{Dom, MutNullableDom}; -use crate::dom::webglbuffer::WebGLBuffer; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglbuffer::WebGLBuffer; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; #[derive(JSTraceable, MallocSizeOf)] #[cfg_attr(crown, crown::unrooted_must_root_lint::must_root)] diff --git a/components/script/dom/webgl2renderingcontext.rs b/components/script/dom/webgl/webgl2renderingcontext.rs similarity index 99% rename from components/script/dom/webgl2renderingcontext.rs rename to components/script/dom/webgl/webgl2renderingcontext.rs index 9298783c8bd..5fde637dbeb 100644 --- a/components/script/dom/webgl2renderingcontext.rs +++ b/components/script/dom/webgl/webgl2renderingcontext.rs @@ -28,7 +28,7 @@ use servo_config::pref; use url::Host; use webrender_api::ImageKey; -use super::webgl_validations::types::TexImageTarget; +use super::validations::types::TexImageTarget; use crate::canvas_context::CanvasContext; use crate::dom::bindings::codegen::Bindings::WebGL2RenderingContextBinding::{ WebGL2RenderingContextConstants as constants, WebGL2RenderingContextMethods, @@ -49,29 +49,31 @@ use crate::dom::globalscope::GlobalScope; use crate::dom::htmlcanvaselement::LayoutCanvasRenderingContextHelpers; #[cfg(feature = "webxr")] use crate::dom::promise::Promise; -use crate::dom::webgl_validations::WebGLValidator; -use crate::dom::webgl_validations::tex_image_2d::{ +use crate::dom::webgl::validations::WebGLValidator; +use crate::dom::webgl::validations::tex_image_2d::{ TexImage2DValidator, TexImage2DValidatorResult, TexStorageValidator, TexStorageValidatorResult, }; -use crate::dom::webgl_validations::tex_image_3d::{TexImage3DValidator, TexImage3DValidatorResult}; -use crate::dom::webglactiveinfo::WebGLActiveInfo; -use crate::dom::webglbuffer::WebGLBuffer; -use crate::dom::webglframebuffer::{WebGLFramebuffer, WebGLFramebufferAttachmentRoot}; -use crate::dom::webglprogram::WebGLProgram; -use crate::dom::webglquery::WebGLQuery; -use crate::dom::webglrenderbuffer::WebGLRenderbuffer; -use crate::dom::webglrenderingcontext::{ +use crate::dom::webgl::validations::tex_image_3d::{ + TexImage3DValidator, TexImage3DValidatorResult, +}; +use crate::dom::webgl::webglactiveinfo::WebGLActiveInfo; +use crate::dom::webgl::webglbuffer::WebGLBuffer; +use crate::dom::webgl::webglframebuffer::{WebGLFramebuffer, WebGLFramebufferAttachmentRoot}; +use crate::dom::webgl::webglprogram::WebGLProgram; +use crate::dom::webgl::webglquery::WebGLQuery; +use crate::dom::webgl::webglrenderbuffer::WebGLRenderbuffer; +use crate::dom::webgl::webglrenderingcontext::{ Operation, TexPixels, TexSource, VertexAttrib, WebGLRenderingContext, uniform_get, uniform_typed, }; -use crate::dom::webglsampler::{WebGLSampler, WebGLSamplerValue}; -use crate::dom::webglshader::WebGLShader; -use crate::dom::webglshaderprecisionformat::WebGLShaderPrecisionFormat; -use crate::dom::webglsync::WebGLSync; -use crate::dom::webgltexture::WebGLTexture; -use crate::dom::webgltransformfeedback::WebGLTransformFeedback; -use crate::dom::webgluniformlocation::WebGLUniformLocation; -use crate::dom::webglvertexarrayobject::WebGLVertexArrayObject; +use crate::dom::webgl::webglsampler::{WebGLSampler, WebGLSamplerValue}; +use crate::dom::webgl::webglshader::WebGLShader; +use crate::dom::webgl::webglshaderprecisionformat::WebGLShaderPrecisionFormat; +use crate::dom::webgl::webglsync::WebGLSync; +use crate::dom::webgl::webgltexture::WebGLTexture; +use crate::dom::webgl::webgltransformfeedback::WebGLTransformFeedback; +use crate::dom::webgl::webgluniformlocation::WebGLUniformLocation; +use crate::dom::webgl::webglvertexarrayobject::WebGLVertexArrayObject; use crate::dom::window::Window; use crate::script_runtime::{CanGc, JSContext}; @@ -656,7 +658,9 @@ impl WebGL2RenderingContext { pname: u32, mut rval: MutableHandleValue, ) -> WebGLResult<()> { - use crate::dom::webglframebuffer::WebGLFramebufferAttachmentRoot::{Renderbuffer, Texture}; + use crate::dom::webgl::webglframebuffer::WebGLFramebufferAttachmentRoot::{ + Renderbuffer, Texture, + }; match attachment { constants::DEPTH_ATTACHMENT | constants::STENCIL_ATTACHMENT => {}, diff --git a/components/script/dom/webglactiveinfo.rs b/components/script/dom/webgl/webglactiveinfo.rs similarity index 100% rename from components/script/dom/webglactiveinfo.rs rename to components/script/dom/webgl/webglactiveinfo.rs diff --git a/components/script/dom/webglbuffer.rs b/components/script/dom/webgl/webglbuffer.rs similarity index 98% rename from components/script/dom/webglbuffer.rs rename to components/script/dom/webgl/webglbuffer.rs index 4aa64e90a7d..883d9b32b7d 100644 --- a/components/script/dom/webglbuffer.rs +++ b/components/script/dom/webgl/webglbuffer.rs @@ -15,8 +15,8 @@ use crate::dom::bindings::codegen::Bindings::WebGLRenderingContextBinding::WebGL use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; fn target_is_copy_buffer(target: u32) -> bool { diff --git a/components/script/dom/webglcontextevent.rs b/components/script/dom/webgl/webglcontextevent.rs similarity index 100% rename from components/script/dom/webglcontextevent.rs rename to components/script/dom/webgl/webglcontextevent.rs diff --git a/components/script/dom/webglframebuffer.rs b/components/script/dom/webgl/webglframebuffer.rs similarity index 99% rename from components/script/dom/webglframebuffer.rs rename to components/script/dom/webgl/webglframebuffer.rs index e1792fd7cb2..a87a2d5aad4 100644 --- a/components/script/dom/webglframebuffer.rs +++ b/components/script/dom/webgl/webglframebuffer.rs @@ -23,10 +23,10 @@ use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; #[cfg(feature = "webxr")] use crate::dom::bindings::root::MutNullableDom; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderbuffer::WebGLRenderbuffer; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; -use crate::dom::webgltexture::WebGLTexture; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderbuffer::WebGLRenderbuffer; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webgltexture::WebGLTexture; #[cfg(feature = "webxr")] use crate::dom::xrsession::XRSession; use crate::script_runtime::CanGc; diff --git a/components/script/dom/webglobject.rs b/components/script/dom/webgl/webglobject.rs similarity index 95% rename from components/script/dom/webglobject.rs rename to components/script/dom/webgl/webglobject.rs index bab32629a8e..54442eae840 100644 --- a/components/script/dom/webglobject.rs +++ b/components/script/dom/webgl/webglobject.rs @@ -10,7 +10,7 @@ use crate::dom::bindings::codegen::Bindings::WebGLObjectBinding::WebGLObjectMeth use crate::dom::bindings::reflector::Reflector; use crate::dom::bindings::root::Dom; use crate::dom::bindings::str::USVString; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; #[dom_struct] pub(crate) struct WebGLObject { diff --git a/components/script/dom/webglprogram.rs b/components/script/dom/webgl/webglprogram.rs similarity index 98% rename from components/script/dom/webglprogram.rs rename to components/script/dom/webgl/webglprogram.rs index c28be8a75dc..875be1dc4d0 100644 --- a/components/script/dom/webglprogram.rs +++ b/components/script/dom/webgl/webglprogram.rs @@ -20,11 +20,11 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; use crate::dom::bindings::str::DOMString; -use crate::dom::webglactiveinfo::WebGLActiveInfo; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; -use crate::dom::webglshader::WebGLShader; -use crate::dom::webgluniformlocation::WebGLUniformLocation; +use crate::dom::webgl::webglactiveinfo::WebGLActiveInfo; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglshader::WebGLShader; +use crate::dom::webgl::webgluniformlocation::WebGLUniformLocation; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webglquery.rs b/components/script/dom/webgl/webglquery.rs similarity index 97% rename from components/script/dom/webglquery.rs rename to components/script/dom/webgl/webglquery.rs index 468a14fa477..b2023da628b 100644 --- a/components/script/dom/webglquery.rs +++ b/components/script/dom/webgl/webglquery.rs @@ -13,8 +13,8 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webglrenderbuffer.rs b/components/script/dom/webgl/webglrenderbuffer.rs similarity index 98% rename from components/script/dom/webglrenderbuffer.rs rename to components/script/dom/webgl/webglrenderbuffer.rs index ecfdf9573e7..221b44c24f2 100644 --- a/components/script/dom/webglrenderbuffer.rs +++ b/components/script/dom/webgl/webglrenderbuffer.rs @@ -17,9 +17,9 @@ use crate::dom::bindings::codegen::Bindings::WebGL2RenderingContextBinding::WebG use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; -use crate::dom::webglframebuffer::WebGLFramebuffer; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglframebuffer::WebGLFramebuffer; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webgl/webglrenderingcontext.rs similarity index 99% rename from components/script/dom/webglrenderingcontext.rs rename to components/script/dom/webgl/webglrenderingcontext.rs index 752b0511b11..b847d6b2f6b 100644 --- a/components/script/dom/webglrenderingcontext.rs +++ b/components/script/dom/webgl/webglrenderingcontext.rs @@ -60,30 +60,30 @@ use crate::dom::htmlcanvaselement::LayoutCanvasRenderingContextHelpers; use crate::dom::node::{Node, NodeDamage, NodeTraits}; #[cfg(feature = "webxr")] use crate::dom::promise::Promise; -use crate::dom::vertexarrayobject::VertexAttribData; -use crate::dom::webgl_extensions::WebGLExtensions; -use crate::dom::webgl_validations::WebGLValidator; -use crate::dom::webgl_validations::tex_image_2d::{ +use crate::dom::webgl::extensions::WebGLExtensions; +use crate::dom::webgl::validations::WebGLValidator; +use crate::dom::webgl::validations::tex_image_2d::{ CommonCompressedTexImage2DValidatorResult, CommonTexImage2DValidator, CommonTexImage2DValidatorResult, CompressedTexImage2DValidator, CompressedTexSubImage2DValidator, TexImage2DValidator, TexImage2DValidatorResult, }; -use crate::dom::webgl_validations::types::TexImageTarget; -use crate::dom::webglactiveinfo::WebGLActiveInfo; -use crate::dom::webglbuffer::WebGLBuffer; -use crate::dom::webglcontextevent::WebGLContextEvent; -use crate::dom::webglframebuffer::{ +use crate::dom::webgl::validations::types::TexImageTarget; +use crate::dom::webgl::vertexarrayobject::VertexAttribData; +use crate::dom::webgl::webglactiveinfo::WebGLActiveInfo; +use crate::dom::webgl::webglbuffer::WebGLBuffer; +use crate::dom::webgl::webglcontextevent::WebGLContextEvent; +use crate::dom::webgl::webglframebuffer::{ CompleteForRendering, WebGLFramebuffer, WebGLFramebufferAttachmentRoot, }; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglprogram::WebGLProgram; -use crate::dom::webglrenderbuffer::WebGLRenderbuffer; -use crate::dom::webglshader::WebGLShader; -use crate::dom::webglshaderprecisionformat::WebGLShaderPrecisionFormat; -use crate::dom::webgltexture::{TexParameterValue, WebGLTexture}; -use crate::dom::webgluniformlocation::WebGLUniformLocation; -use crate::dom::webglvertexarrayobject::WebGLVertexArrayObject; -use crate::dom::webglvertexarrayobjectoes::WebGLVertexArrayObjectOES; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglprogram::WebGLProgram; +use crate::dom::webgl::webglrenderbuffer::WebGLRenderbuffer; +use crate::dom::webgl::webglshader::WebGLShader; +use crate::dom::webgl::webglshaderprecisionformat::WebGLShaderPrecisionFormat; +use crate::dom::webgl::webgltexture::{TexParameterValue, WebGLTexture}; +use crate::dom::webgl::webgluniformlocation::WebGLUniformLocation; +use crate::dom::webgl::webglvertexarrayobject::WebGLVertexArrayObject; +use crate::dom::webgl::webglvertexarrayobjectoes::WebGLVertexArrayObjectOES; use crate::dom::window::Window; use crate::script_runtime::{CanGc, JSContext as SafeJSContext}; diff --git a/components/script/dom/webglsampler.rs b/components/script/dom/webgl/webglsampler.rs similarity index 98% rename from components/script/dom/webglsampler.rs rename to components/script/dom/webgl/webglsampler.rs index 1832fc154ce..bef9082d343 100644 --- a/components/script/dom/webglsampler.rs +++ b/components/script/dom/webgl/webglsampler.rs @@ -12,8 +12,8 @@ use crate::dom::bindings::codegen::Bindings::WebGL2RenderingContextBinding::WebG use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webglshader.rs b/components/script/dom/webgl/webglshader.rs similarity index 96% rename from components/script/dom/webglshader.rs rename to components/script/dom/webgl/webglshader.rs index a8025ff5989..52a76cb8946 100644 --- a/components/script/dom/webglshader.rs +++ b/components/script/dom/webgl/webglshader.rs @@ -19,12 +19,12 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; -use crate::dom::webgl_extensions::WebGLExtensions; -use crate::dom::webgl_extensions::ext::extfragdepth::EXTFragDepth; -use crate::dom::webgl_extensions::ext::extshadertexturelod::EXTShaderTextureLod; -use crate::dom::webgl_extensions::ext::oesstandardderivatives::OESStandardDerivatives; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::extensions::WebGLExtensions; +use crate::dom::webgl::extensions::extfragdepth::EXTFragDepth; +use crate::dom::webgl::extensions::extshadertexturelod::EXTShaderTextureLod; +use crate::dom::webgl::extensions::oesstandardderivatives::OESStandardDerivatives; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[derive(Clone, Copy, Debug, JSTraceable, MallocSizeOf, PartialEq)] diff --git a/components/script/dom/webglshaderprecisionformat.rs b/components/script/dom/webgl/webglshaderprecisionformat.rs similarity index 100% rename from components/script/dom/webglshaderprecisionformat.rs rename to components/script/dom/webgl/webglshaderprecisionformat.rs diff --git a/components/script/dom/webglsync.rs b/components/script/dom/webgl/webglsync.rs similarity index 97% rename from components/script/dom/webglsync.rs rename to components/script/dom/webgl/webglsync.rs index f3ef5f605c6..bb2dbcf055f 100644 --- a/components/script/dom/webglsync.rs +++ b/components/script/dom/webgl/webglsync.rs @@ -12,8 +12,8 @@ use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::refcounted::Trusted; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgltexture.rs b/components/script/dom/webgl/webgltexture.rs similarity index 98% rename from components/script/dom/webgltexture.rs rename to components/script/dom/webgl/webgltexture.rs index 1be6376c8ba..5d47fbd8d57 100644 --- a/components/script/dom/webgltexture.rs +++ b/components/script/dom/webgl/webgltexture.rs @@ -21,10 +21,10 @@ use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; #[cfg(feature = "webxr")] use crate::dom::bindings::root::Dom; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; -use crate::dom::webgl_validations::types::TexImageTarget; -use crate::dom::webglframebuffer::WebGLFramebuffer; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::validations::types::TexImageTarget; +use crate::dom::webgl::webglframebuffer::WebGLFramebuffer; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; #[cfg(feature = "webxr")] use crate::dom::xrsession::XRSession; use crate::script_runtime::CanGc; diff --git a/components/script/dom/webgltransformfeedback.rs b/components/script/dom/webgl/webgltransformfeedback.rs similarity index 96% rename from components/script/dom/webgltransformfeedback.rs rename to components/script/dom/webgl/webgltransformfeedback.rs index 413527b5a87..4196f73e762 100644 --- a/components/script/dom/webgltransformfeedback.rs +++ b/components/script/dom/webgl/webgltransformfeedback.rs @@ -10,8 +10,8 @@ use dom_struct::dom_struct; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::DomRoot; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webgluniformlocation.rs b/components/script/dom/webgl/webgluniformlocation.rs similarity index 100% rename from components/script/dom/webgluniformlocation.rs rename to components/script/dom/webgl/webgluniformlocation.rs diff --git a/components/script/dom/webglvertexarrayobject.rs b/components/script/dom/webgl/webglvertexarrayobject.rs similarity index 92% rename from components/script/dom/webglvertexarrayobject.rs rename to components/script/dom/webgl/webglvertexarrayobject.rs index 37deda8c5c0..db34d1ccbc6 100644 --- a/components/script/dom/webglvertexarrayobject.rs +++ b/components/script/dom/webgl/webglvertexarrayobject.rs @@ -8,10 +8,10 @@ use dom_struct::dom_struct; use crate::dom::bindings::cell::Ref; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; -use crate::dom::vertexarrayobject::{VertexArrayObject, VertexAttribData}; -use crate::dom::webglbuffer::WebGLBuffer; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::vertexarrayobject::{VertexArrayObject, VertexAttribData}; +use crate::dom::webgl::webglbuffer::WebGLBuffer; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webglvertexarrayobjectoes.rs b/components/script/dom/webgl/webglvertexarrayobjectoes.rs similarity index 92% rename from components/script/dom/webglvertexarrayobjectoes.rs rename to components/script/dom/webgl/webglvertexarrayobjectoes.rs index 100315fcdf5..e7c5077edf6 100644 --- a/components/script/dom/webglvertexarrayobjectoes.rs +++ b/components/script/dom/webgl/webglvertexarrayobjectoes.rs @@ -8,10 +8,10 @@ use dom_struct::dom_struct; use crate::dom::bindings::cell::Ref; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object}; use crate::dom::bindings::root::{DomRoot, MutNullableDom}; -use crate::dom::vertexarrayobject::{VertexArrayObject, VertexAttribData}; -use crate::dom::webglbuffer::WebGLBuffer; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::{Operation, WebGLRenderingContext}; +use crate::dom::webgl::vertexarrayobject::{VertexArrayObject, VertexAttribData}; +use crate::dom::webgl::webglbuffer::WebGLBuffer; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::{Operation, WebGLRenderingContext}; use crate::script_runtime::CanGc; #[dom_struct] diff --git a/components/script/dom/webxr/xrlayer.rs b/components/script/dom/webxr/xrlayer.rs index 1920e508819..de51d44fa6f 100644 --- a/components/script/dom/webxr/xrlayer.rs +++ b/components/script/dom/webxr/xrlayer.rs @@ -10,7 +10,7 @@ use crate::canvas_context::CanvasContext as _; use crate::dom::bindings::inheritance::Castable; use crate::dom::bindings::root::Dom; use crate::dom::eventtarget::EventTarget; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::dom::xrframe::XRFrame; use crate::dom::xrsession::XRSession; use crate::dom::xrwebgllayer::XRWebGLLayer; diff --git a/components/script/dom/webxr/xrwebglbinding.rs b/components/script/dom/webxr/xrwebglbinding.rs index d0e7c3a3d01..311895fda63 100644 --- a/components/script/dom/webxr/xrwebglbinding.rs +++ b/components/script/dom/webxr/xrwebglbinding.rs @@ -16,7 +16,7 @@ use crate::dom::bindings::codegen::UnionTypes::WebGLRenderingContextOrWebGL2Rend use crate::dom::bindings::error::{Error, Fallible}; use crate::dom::bindings::reflector::{reflect_dom_object_with_proto, Reflector}; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; use crate::dom::window::Window; use crate::dom::xrcompositionlayer::XRCompositionLayer; use crate::dom::xrcubelayer::XRCubeLayer; diff --git a/components/script/dom/webxr/xrwebgllayer.rs b/components/script/dom/webxr/xrwebgllayer.rs index 0d32b10cf47..32a745f42b7 100644 --- a/components/script/dom/webxr/xrwebgllayer.rs +++ b/components/script/dom/webxr/xrwebgllayer.rs @@ -24,10 +24,10 @@ use crate::dom::bindings::num::Finite; use crate::dom::bindings::reflector::{DomGlobal, reflect_dom_object_with_proto}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::globalscope::GlobalScope; -use crate::dom::webglframebuffer::WebGLFramebuffer; -use crate::dom::webglobject::WebGLObject; -use crate::dom::webglrenderingcontext::WebGLRenderingContext; -use crate::dom::webgltexture::WebGLTexture; +use crate::dom::webgl::webglframebuffer::WebGLFramebuffer; +use crate::dom::webgl::webglobject::WebGLObject; +use crate::dom::webgl::webglrenderingcontext::WebGLRenderingContext; +use crate::dom::webgl::webgltexture::WebGLTexture; use crate::dom::window::Window; use crate::dom::xrframe::XRFrame; use crate::dom::xrlayer::XRLayer; diff --git a/components/script/dom/webxr/xrwebglsubimage.rs b/components/script/dom/webxr/xrwebglsubimage.rs index 67b2c5e8c1d..f074d43b59b 100644 --- a/components/script/dom/webxr/xrwebglsubimage.rs +++ b/components/script/dom/webxr/xrwebglsubimage.rs @@ -8,7 +8,7 @@ use webxr_api::Viewport; use crate::dom::bindings::codegen::Bindings::XRWebGLSubImageBinding::XRWebGLSubImage_Binding::XRWebGLSubImageMethods; use crate::dom::bindings::root::{Dom, DomRoot}; -use crate::dom::webgltexture::WebGLTexture; +use crate::dom::webgl::webgltexture::WebGLTexture; use crate::dom::xrsubimage::XRSubImage; #[dom_struct] diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index c9463489333..27ee62a7552 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -161,7 +161,7 @@ use crate::dom::storage::Storage; use crate::dom::testrunner::TestRunner; use crate::dom::trustedtypepolicyfactory::TrustedTypePolicyFactory; use crate::dom::types::{ImageBitmap, UIEvent}; -use crate::dom::webglrenderingcontext::WebGLCommandSender; +use crate::dom::webgl::webglrenderingcontext::WebGLCommandSender; #[cfg(feature = "webgpu")] use crate::dom::webgpu::identityhub::IdentityHub; use crate::dom::windowproxy::{WindowProxy, WindowProxyHandler};