mirror of
https://github.com/servo/servo.git
synced 2025-06-08 16:43:28 +00:00
a0640c8524
This change makes changes to allow Servo to compile with the 1.78 version of Rust: - Dead code is removd (Rust seems to have gotten better at detecting it). - The `FlowRef` `DerefMut` is updated according to @SimonSapin's advice [^1]. - The `imports.rs` now explicitly silences warnings about unused imports. [^1]: https://github.com/servo/servo/issues/6503#issuecomment-2066088179 <!-- Please describe your changes on the following line: --> --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: --> - [x] `./mach build -d` does not report any errors - [x] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because they should not change behavior. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
87 lines
2.6 KiB
Rust
87 lines
2.6 KiB
Rust
/* 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 std::ptr::NonNull;
|
|
|
|
use js::jsapi::JSObject;
|
|
use malloc_size_of::MallocSizeOf;
|
|
|
|
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;
|
|
|
|
/// 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;
|
|
}
|
|
|
|
#[crown::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()
|
|
}
|
|
}
|