diff options
author | Josh Matthews <josh@joshmatthews.net> | 2025-03-16 09:46:14 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-03-16 13:46:14 +0000 |
commit | d35da38a2fd6f093967e74f704612391b4988e69 (patch) | |
tree | 96c8705a5a597be25ac74b58043e57b3e06992f4 /components/script/dom/webgpu | |
parent | 3ecd1c069978f6ceb20e4ee6af599fbef425e9da (diff) | |
download | servo-d35da38a2fd6f093967e74f704612391b4988e69.tar.gz servo-d35da38a2fd6f093967e74f704612391b4988e69.zip |
Cleanups for future script crate split (#35987)
* script: Avoid direct impl blocks on generated dicts and unions.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* script: Remove references to codegen-specific import module.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
* Fix tidy.
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
---------
Signed-off-by: Josh Matthews <josh@joshmatthews.net>
Diffstat (limited to 'components/script/dom/webgpu')
-rw-r--r-- | components/script/dom/webgpu/gpucanvascontext.rs | 2 | ||||
-rw-r--r-- | components/script/dom/webgpu/gpucompilationinfo.rs | 2 | ||||
-rw-r--r-- | components/script/dom/webgpu/gpudevice.rs | 1 | ||||
-rw-r--r-- | components/script/dom/webgpu/gpuerror.rs | 8 | ||||
-rw-r--r-- | components/script/dom/webgpu/gpurenderbundleencoder.rs | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/components/script/dom/webgpu/gpucanvascontext.rs b/components/script/dom/webgpu/gpucanvascontext.rs index fd621ebc335..1f5de8ea194 100644 --- a/components/script/dom/webgpu/gpucanvascontext.rs +++ b/components/script/dom/webgpu/gpucanvascontext.rs @@ -19,7 +19,7 @@ use webrender_api::units::DeviceIntSize; use super::gpuconvert::convert_texture_descriptor; use super::gputexture::GPUTexture; -use crate::canvas_context::CanvasContext; +use crate::canvas_context::{CanvasContext, CanvasHelpers}; use crate::conversions::Convert; use crate::dom::bindings::codegen::Bindings::GPUCanvasContextBinding::GPUCanvasContextMethods; use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUTexture_Binding::GPUTextureMethods; diff --git a/components/script/dom/webgpu/gpucompilationinfo.rs b/components/script/dom/webgpu/gpucompilationinfo.rs index 70fcd3f5398..a2f0cc3ff89 100644 --- a/components/script/dom/webgpu/gpucompilationinfo.rs +++ b/components/script/dom/webgpu/gpucompilationinfo.rs @@ -7,8 +7,8 @@ use js::rust::MutableHandleValue; use webgpu::ShaderCompilationInfo; use crate::dom::bindings::codegen::Bindings::WebGPUBinding::GPUCompilationInfoMethods; -use crate::dom::bindings::import::module::DomRoot; use crate::dom::bindings::reflector::{Reflector, reflect_dom_object_with_proto}; +use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::utils::to_frozen_array; use crate::dom::globalscope::GlobalScope; use crate::dom::types::GPUCompilationMessage; diff --git a/components/script/dom/webgpu/gpudevice.rs b/components/script/dom/webgpu/gpudevice.rs index 681d90e40e3..c5f4638479d 100644 --- a/components/script/dom/webgpu/gpudevice.rs +++ b/components/script/dom/webgpu/gpudevice.rs @@ -21,6 +21,7 @@ use webgpu::{ use super::gpu::AsyncWGPUListener; use super::gpudevicelostinfo::GPUDeviceLostInfo; +use super::gpuerror::AsWebGpu; use super::gpupipelineerror::GPUPipelineError; use super::gpusupportedlimits::GPUSupportedLimits; use crate::conversions::Convert; diff --git a/components/script/dom/webgpu/gpuerror.rs b/components/script/dom/webgpu/gpuerror.rs index 3456b09165e..8b9d643d8b9 100644 --- a/components/script/dom/webgpu/gpuerror.rs +++ b/components/script/dom/webgpu/gpuerror.rs @@ -90,8 +90,12 @@ impl Convert<GPUErrorFilter> for ErrorFilter { } } -impl GPUErrorFilter { - pub(crate) fn as_webgpu(&self) -> ErrorFilter { +pub(crate) trait AsWebGpu { + fn as_webgpu(&self) -> ErrorFilter; +} + +impl AsWebGpu for GPUErrorFilter { + fn as_webgpu(&self) -> ErrorFilter { match self { GPUErrorFilter::Validation => ErrorFilter::Validation, GPUErrorFilter::Out_of_memory => ErrorFilter::OutOfMemory, diff --git a/components/script/dom/webgpu/gpurenderbundleencoder.rs b/components/script/dom/webgpu/gpurenderbundleencoder.rs index 2e7a1cc8f35..1353f46dd5b 100644 --- a/components/script/dom/webgpu/gpurenderbundleencoder.rs +++ b/components/script/dom/webgpu/gpurenderbundleencoder.rs @@ -16,7 +16,7 @@ use crate::dom::bindings::codegen::Bindings::WebGPUBinding::{ GPUIndexFormat, GPURenderBundleDescriptor, GPURenderBundleEncoderDescriptor, GPURenderBundleEncoderMethods, }; -use crate::dom::bindings::import::module::Fallible; +use crate::dom::bindings::error::Fallible; use crate::dom::bindings::reflector::{DomGlobal, Reflector, reflect_dom_object}; use crate::dom::bindings::root::{Dom, DomRoot}; use crate::dom::bindings::str::USVString; |