mirror of
https://github.com/servo/servo.git
synced 2025-06-09 09:03:23 +00:00
4506f0d30c
Servo currently uses `heapsize`, but Stylo/Gecko use `malloc_size_of`. `malloc_size_of` is better -- it handles various cases that `heapsize` does not -- so this patch changes Servo to use `malloc_size_of`. This patch makes the following changes to the `malloc_size_of` crate. - Adds `MallocSizeOf` trait implementations for numerous types, some built-in (e.g. `VecDeque`), some external and Servo-only (e.g. `string_cache`). - Makes `enclosing_size_of_op` optional, because vanilla jemalloc doesn't support that operation. - For `HashSet`/`HashMap`, falls back to a computed estimate when `enclosing_size_of_op` isn't available. - Adds an extern "C" `malloc_size_of` function that does the actual heap measurement; this is based on the same functions from the `heapsize` crate. This patch makes the following changes elsewhere. - Converts all the uses of `heapsize` to instead use `malloc_size_of`. - Disables the "heapsize"/"heap_size" feature for the external crates that provide it. - Removes the `HeapSizeOf` implementation from `hashglobe`. - Adds `ignore` annotations to a few `Rc`/`Arc`, because `malloc_size_of` doesn't derive those types, unlike `heapsize`.
91 lines
2.8 KiB
Rust
91 lines
2.8 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 http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::nonnull::NonNullJSObjectPtr;
|
|
use dom::bindings::reflector::DomObject;
|
|
use dom::bindings::root::{DomRoot, MutNullableDom};
|
|
use dom::bindings::trace::JSTraceable;
|
|
use dom::webglrenderingcontext::WebGLRenderingContext;
|
|
use malloc_size_of::MallocSizeOf;
|
|
use std::any::Any;
|
|
use super::{WebGLExtension, WebGLExtensions};
|
|
|
|
/// 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)
|
|
-> NonNullJSObjectPtr;
|
|
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) -> &Any;
|
|
}
|
|
|
|
#[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)
|
|
-> NonNullJSObjectPtr {
|
|
let mut enabled = true;
|
|
let extension = self.extension.or_init(|| {
|
|
enabled = false;
|
|
T::new(ctx)
|
|
});
|
|
if !enabled {
|
|
self.enable(ext);
|
|
}
|
|
unsafe {
|
|
NonNullJSObjectPtr::new_unchecked(extension.reflector().get_jsobject().get())
|
|
}
|
|
}
|
|
|
|
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 Any {
|
|
self
|
|
}
|
|
}
|
|
|
|
impl<T> TypedWebGLExtensionWrapper<T>
|
|
where T: WebGLExtension + JSTraceable + MallocSizeOf + 'static
|
|
{
|
|
pub fn dom_object(&self) -> Option<DomRoot<T::Extension>> {
|
|
self.extension.get()
|
|
}
|
|
}
|