mirror of
https://github.com/servo/servo.git
synced 2025-06-09 00:53:26 +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`.
50 lines
1.7 KiB
Rust
50 lines
1.7 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::codegen::Bindings::PromiseNativeHandlerBinding;
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::bindings::root::DomRoot;
|
|
use dom::bindings::trace::JSTraceable;
|
|
use dom::globalscope::GlobalScope;
|
|
use dom_struct::dom_struct;
|
|
use js::jsapi::{JSContext, HandleValue};
|
|
use malloc_size_of::MallocSizeOf;
|
|
|
|
pub trait Callback: JSTraceable + MallocSizeOf {
|
|
fn callback(&self, cx: *mut JSContext, v: HandleValue);
|
|
}
|
|
|
|
#[dom_struct]
|
|
pub struct PromiseNativeHandler {
|
|
reflector: Reflector,
|
|
resolve: Option<Box<Callback>>,
|
|
reject: Option<Box<Callback>>,
|
|
}
|
|
|
|
impl PromiseNativeHandler {
|
|
pub fn new(global: &GlobalScope,
|
|
resolve: Option<Box<Callback>>,
|
|
reject: Option<Box<Callback>>)
|
|
-> DomRoot<PromiseNativeHandler> {
|
|
reflect_dom_object(Box::new(PromiseNativeHandler {
|
|
reflector: Reflector::new(),
|
|
resolve: resolve,
|
|
reject: reject,
|
|
}), global, PromiseNativeHandlerBinding::Wrap)
|
|
}
|
|
|
|
fn callback(callback: &Option<Box<Callback>>, cx: *mut JSContext, v: HandleValue) {
|
|
if let Some(ref callback) = *callback {
|
|
callback.callback(cx, v)
|
|
}
|
|
}
|
|
|
|
pub fn resolved_callback(&self, cx: *mut JSContext, v: HandleValue) {
|
|
PromiseNativeHandler::callback(&self.resolve, cx, v)
|
|
}
|
|
|
|
pub fn rejected_callback(&self, cx: *mut JSContext, v: HandleValue) {
|
|
PromiseNativeHandler::callback(&self.reject, cx, v)
|
|
}
|
|
}
|