mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +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`.
83 lines
2.6 KiB
Rust
83 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 http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::cell::DomRefCell;
|
|
use dom::bindings::codegen::Bindings::CryptoBinding;
|
|
use dom::bindings::codegen::Bindings::CryptoBinding::CryptoMethods;
|
|
use dom::bindings::error::{Error, Fallible};
|
|
use dom::bindings::nonnull::NonNullJSObjectPtr;
|
|
use dom::bindings::reflector::{Reflector, reflect_dom_object};
|
|
use dom::bindings::root::DomRoot;
|
|
use dom::globalscope::GlobalScope;
|
|
use dom_struct::dom_struct;
|
|
use js::jsapi::{JSContext, JSObject};
|
|
use js::jsapi::Type;
|
|
use servo_rand::{ServoRng, Rng};
|
|
|
|
unsafe_no_jsmanaged_fields!(ServoRng);
|
|
|
|
// https://developer.mozilla.org/en-US/docs/Web/API/Crypto
|
|
#[dom_struct]
|
|
pub struct Crypto {
|
|
reflector_: Reflector,
|
|
#[ignore_malloc_size_of = "Defined in rand"]
|
|
rng: DomRefCell<ServoRng>,
|
|
}
|
|
|
|
impl Crypto {
|
|
fn new_inherited() -> Crypto {
|
|
Crypto {
|
|
reflector_: Reflector::new(),
|
|
rng: DomRefCell::new(ServoRng::new()),
|
|
}
|
|
}
|
|
|
|
pub fn new(global: &GlobalScope) -> DomRoot<Crypto> {
|
|
reflect_dom_object(Box::new(Crypto::new_inherited()), global, CryptoBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl CryptoMethods for Crypto {
|
|
#[allow(unsafe_code)]
|
|
// https://dvcs.w3.org/hg/webcrypto-api/raw-file/tip/spec/Overview.html#Crypto-method-getRandomValues
|
|
unsafe fn GetRandomValues(&self,
|
|
_cx: *mut JSContext,
|
|
input: *mut JSObject)
|
|
-> Fallible<NonNullJSObjectPtr> {
|
|
assert!(!input.is_null());
|
|
typedarray!(in(_cx) let mut array_buffer_view: ArrayBufferView = input);
|
|
let (array_type, mut data) = match array_buffer_view.as_mut() {
|
|
Ok(x) => (x.get_array_type(), x.as_mut_slice()),
|
|
Err(_) => {
|
|
return Err(Error::Type("Argument to Crypto.getRandomValues is not an ArrayBufferView"
|
|
.to_owned()));
|
|
}
|
|
};
|
|
|
|
if !is_integer_buffer(array_type) {
|
|
return Err(Error::TypeMismatch);
|
|
}
|
|
|
|
if data.len() > 65536 {
|
|
return Err(Error::QuotaExceeded);
|
|
}
|
|
|
|
self.rng.borrow_mut().fill_bytes(&mut data);
|
|
|
|
Ok(NonNullJSObjectPtr::new_unchecked(input))
|
|
}
|
|
}
|
|
|
|
fn is_integer_buffer(array_type: Type) -> bool {
|
|
match array_type {
|
|
Type::Uint8 |
|
|
Type::Uint8Clamped |
|
|
Type::Int8 |
|
|
Type::Uint16 |
|
|
Type::Int16 |
|
|
Type::Uint32 |
|
|
Type::Int32 => true,
|
|
_ => false,
|
|
}
|
|
}
|