aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--components/script/dom/gpu.rs9
-rw-r--r--components/script/dom/gpuadapter.rs10
-rw-r--r--components/script/dom/gpudevice.rs4
3 files changed, 7 insertions, 16 deletions
diff --git a/components/script/dom/gpu.rs b/components/script/dom/gpu.rs
index 4c4bd830f6e..65f9cdeb0f8 100644
--- a/components/script/dom/gpu.rs
+++ b/components/script/dom/gpu.rs
@@ -132,9 +132,7 @@ impl GPUMethods for GPU {
))
.is_err()
{
- promise.reject_error(Error::Type(
- "Failed to send adapter request to constellation...".to_owned(),
- ));
+ promise.reject_error(Error::Operation);
}
promise
}
@@ -153,10 +151,7 @@ impl AsyncWGPUListener for GPU {
);
promise.resolve_native(&adapter);
},
- response => promise.reject_error(Error::Type(format!(
- "Wrong response received for GPU from WebGPU thread {:?}",
- response,
- ))),
+ _ => promise.reject_error(Error::Operation),
}
}
}
diff --git a/components/script/dom/gpuadapter.rs b/components/script/dom/gpuadapter.rs
index 80438c305ac..ca656af5044 100644
--- a/components/script/dom/gpuadapter.rs
+++ b/components/script/dom/gpuadapter.rs
@@ -102,12 +102,10 @@ impl GPUAdapterMethods for GPUAdapter {
.send(WebGPURequest::RequestDevice(sender, self.adapter, desc, id))
.is_err()
{
- promise.reject_error(Error::Type(
- "Failed to send RequestDevice message...".to_owned(),
- ));
+ promise.reject_error(Error::Operation);
}
} else {
- promise.reject_error(Error::Type("No WebGPU thread...".to_owned()))
+ promise.reject_error(Error::Operation);
};
promise
}
@@ -127,9 +125,7 @@ impl AsyncWGPUListener for GPUAdapter {
);
promise.resolve_native(&device);
},
- _ => promise.reject_error(Error::Type(
- "Wrong response type from WebGPU thread...".to_owned(),
- )),
+ _ => promise.reject_error(Error::Operation),
}
}
}
diff --git a/components/script/dom/gpudevice.rs b/components/script/dom/gpudevice.rs
index ba1ea368a5b..371643b6027 100644
--- a/components/script/dom/gpudevice.rs
+++ b/components/script/dom/gpudevice.rs
@@ -180,7 +180,7 @@ impl GPUDeviceMethods for GPUDevice {
id,
wgpu_descriptor,
))
- .unwrap();
+ .expect("Failed to create WebGPU buffer");
} else {
unimplemented!()
};
@@ -218,7 +218,7 @@ impl GPUDeviceMethods for GPUDevice {
id,
wgpu_descriptor.clone(),
))
- .unwrap()
+ .expect("Failed to create WebGPU buffer");
} else {
return vec![js_val.get()];
};