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, 91 insertions, 0 deletions

diff --git a/components/script/dom/webgl_extensions/wrapper.rs b/components/script/dom/webgl_extensions/wrapper.rs
new file mode 100644
index 00000000000..bf8db31418c
--- /dev/null
+++ b/components/script/dom/webgl_extensions/wrapper.rs
@@ -0,0 +1,91 @@
+/* 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 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 js::jsapi::JSObject;
+use malloc_size_of::MallocSizeOf;
+use std::any::Any;
+use std::ptr::NonNull;
+
+/// Trait used internally by WebGLExtensions to store and
+/// handle the different WebGL extensions in a common list.
+pub trait WebGLExtensionWrapper: JSTraceable + MallocSizeOf {
+    fn instance_or_init(
+        &self,
+        ctx: &WebGLRenderingContext,
+        ext: &WebGLExtensions,
+    ) -> NonNull<JSObject>;
+    fn spec(&self) -> WebGLExtensionSpec;
+    fn is_supported(&self, _: &WebGLExtensions) -> bool;
+    fn is_enabled(&self) -> bool;
+    fn enable(&self, ext: &WebGLExtensions);
+    fn name(&self) -> &'static str;
+    fn as_any(&self) -> &dyn Any;
+}
+
+#[unrooted_must_root_lint::must_root]
+#[derive(JSTraceable, MallocSizeOf)]
+pub struct TypedWebGLExtensionWrapper<T: WebGLExtension> {
+    extension: MutNullableDom<T::Extension>,
+}
+
+/// Typed WebGL Extension implementation.
+/// Exposes the exact MutNullableDom<DOMObject> type defined by the extension.
+impl<T: WebGLExtension> TypedWebGLExtensionWrapper<T> {
+    pub fn new() -> TypedWebGLExtensionWrapper<T> {
+        TypedWebGLExtensionWrapper {
+            extension: MutNullableDom::new(None),
+        }
+    }
+}
+
+impl<T> WebGLExtensionWrapper for TypedWebGLExtensionWrapper<T>
+where
+    T: WebGLExtension + JSTraceable + MallocSizeOf + 'static,
+{
+    #[allow(unsafe_code)]
+    fn instance_or_init(
+        &self,
+        ctx: &WebGLRenderingContext,
+        ext: &WebGLExtensions,
+    ) -> NonNull<JSObject> {
+        let mut enabled = true;
+        let extension = self.extension.or_init(|| {
+            enabled = false;
+            T::new(ctx)
+        });
+        if !enabled {
+            self.enable(ext);
+        }
+        unsafe { NonNull::new_unchecked(extension.reflector().get_jsobject().get()) }
+    }
+
+    fn spec(&self) -> WebGLExtensionSpec {
+        T::spec()
+    }
+
+    fn is_supported(&self, ext: &WebGLExtensions) -> bool {
+        self.is_enabled() || T::is_supported(ext)
+    }
+
+    fn is_enabled(&self) -> bool {
+        self.extension.get().is_some()
+    }
+
+    fn enable(&self, ext: &WebGLExtensions) {
+        T::enable(ext);
+    }
+
+    fn name(&self) -> &'static str {
+        T::name()
+    }
+
+    fn as_any<'a>(&'a self) -> &'a dyn Any {
+        self
+    }
+}