Merge remote-tracking branch 'upstream/master' into feat-cow-infra

`tests/wpt/web-platform-tests/html/browsers/origin/cross-origin-objects/cross-origin-objects.html`
was reverted to the upstream version.

1 files changed, 74 insertions, 0 deletions

diff --git a/components/script/dom/gpusampler.rs b/components/script/dom/gpusampler.rs
new file mode 100644
index 00000000000..23395ee058c
--- /dev/null
+++ b/components/script/dom/gpusampler.rs
@@ -0,0 +1,74 @@
+/* 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/. */
+
+use crate::dom::bindings::cell::DomRefCell;
+use crate::dom::bindings::codegen::Bindings::GPUSamplerBinding::GPUSamplerMethods;
+use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
+use crate::dom::bindings::root::DomRoot;
+use crate::dom::bindings::str::USVString;
+use crate::dom::globalscope::GlobalScope;
+use dom_struct::dom_struct;
+use webgpu::{WebGPUDevice, WebGPUSampler};
+
+#[dom_struct]
+pub struct GPUSampler {
+    reflector_: Reflector,
+    label: DomRefCell<Option<USVString>>,
+    device: WebGPUDevice,
+    compare_enable: bool,
+    sampler: WebGPUSampler,
+}
+
+impl GPUSampler {
+    fn new_inherited(
+        device: WebGPUDevice,
+        compare_enable: bool,
+        sampler: WebGPUSampler,
+        label: Option<USVString>,
+    ) -> Self {
+        Self {
+            reflector_: Reflector::new(),
+            label: DomRefCell::new(label),
+            device,
+            sampler,
+            compare_enable,
+        }
+    }
+
+    pub fn new(
+        global: &GlobalScope,
+        device: WebGPUDevice,
+        compare_enable: bool,
+        sampler: WebGPUSampler,
+        label: Option<USVString>,
+    ) -> DomRoot<Self> {
+        reflect_dom_object(
+            Box::new(GPUSampler::new_inherited(
+                device,
+                compare_enable,
+                sampler,
+                label,
+            )),
+            global,
+        )
+    }
+}
+
+impl GPUSampler {
+    pub fn id(&self) -> WebGPUSampler {
+        self.sampler
+    }
+}
+
+impl GPUSamplerMethods for GPUSampler {
+    /// https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label
+    fn GetLabel(&self) -> Option<USVString> {
+        self.label.borrow().clone()
+    }
+
+    /// https://gpuweb.github.io/gpuweb/#dom-gpuobjectbase-label
+    fn SetLabel(&self, value: Option<USVString>) {
+        *self.label.borrow_mut() = value;
+    }
+}