forked from mirrors/gecko-dev
5a62942911
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`. <!-- 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 - [ ] These changes fix https://bugzilla.mozilla.org/show_bug.cgi?id=1409255 <!-- Either: --> - [ ] There are tests for these changes OR - [ ] These changes do not require tests because testing is on the Gecko side. <!-- 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. --> Source-Repo: https://github.com/servo/servo Source-Revision: 4c538b642e4bdfbf42c522c5a59c258a6d14546e --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : f9a6feed1088d0b0be2b55d7f0c2ec9c594ac33b
102 lines
3.4 KiB
Rust
102 lines
3.4 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::CustomEventBinding;
|
|
use dom::bindings::codegen::Bindings::CustomEventBinding::CustomEventMethods;
|
|
use dom::bindings::codegen::Bindings::EventBinding::EventMethods;
|
|
use dom::bindings::error::Fallible;
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::reflector::reflect_dom_object;
|
|
use dom::bindings::root::DomRoot;
|
|
use dom::bindings::str::DOMString;
|
|
use dom::bindings::trace::RootedTraceableBox;
|
|
use dom::event::Event;
|
|
use dom::globalscope::GlobalScope;
|
|
use dom_struct::dom_struct;
|
|
use js::jsapi::{Heap, HandleValue, JSContext};
|
|
use js::jsval::JSVal;
|
|
use servo_atoms::Atom;
|
|
|
|
// https://dom.spec.whatwg.org/#interface-customevent
|
|
#[dom_struct]
|
|
pub struct CustomEvent {
|
|
event: Event,
|
|
#[ignore_malloc_size_of = "Defined in rust-mozjs"]
|
|
detail: Heap<JSVal>,
|
|
}
|
|
|
|
impl CustomEvent {
|
|
fn new_inherited() -> CustomEvent {
|
|
CustomEvent {
|
|
event: Event::new_inherited(),
|
|
detail: Heap::default(),
|
|
}
|
|
}
|
|
|
|
pub fn new_uninitialized(global: &GlobalScope) -> DomRoot<CustomEvent> {
|
|
reflect_dom_object(Box::new(CustomEvent::new_inherited()),
|
|
global,
|
|
CustomEventBinding::Wrap)
|
|
}
|
|
pub fn new(global: &GlobalScope,
|
|
type_: Atom,
|
|
bubbles: bool,
|
|
cancelable: bool,
|
|
detail: HandleValue)
|
|
-> DomRoot<CustomEvent> {
|
|
let ev = CustomEvent::new_uninitialized(global);
|
|
ev.init_custom_event(type_, bubbles, cancelable, detail);
|
|
ev
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
pub fn Constructor(global: &GlobalScope,
|
|
type_: DOMString,
|
|
init: RootedTraceableBox<CustomEventBinding::CustomEventInit>)
|
|
-> Fallible<DomRoot<CustomEvent>> {
|
|
Ok(CustomEvent::new(global,
|
|
Atom::from(type_),
|
|
init.parent.bubbles,
|
|
init.parent.cancelable,
|
|
init.detail.handle()))
|
|
}
|
|
|
|
fn init_custom_event(&self,
|
|
type_: Atom,
|
|
can_bubble: bool,
|
|
cancelable: bool,
|
|
detail: HandleValue) {
|
|
let event = self.upcast::<Event>();
|
|
if event.dispatching() {
|
|
return;
|
|
}
|
|
|
|
self.detail.set(detail.get());
|
|
event.init_event(type_, can_bubble, cancelable);
|
|
}
|
|
}
|
|
|
|
impl CustomEventMethods for CustomEvent {
|
|
#[allow(unsafe_code)]
|
|
// https://dom.spec.whatwg.org/#dom-customevent-detail
|
|
unsafe fn Detail(&self, _cx: *mut JSContext) -> JSVal {
|
|
self.detail.get()
|
|
}
|
|
|
|
#[allow(unsafe_code)]
|
|
// https://dom.spec.whatwg.org/#dom-customevent-initcustomevent
|
|
unsafe fn InitCustomEvent(&self,
|
|
_cx: *mut JSContext,
|
|
type_: DOMString,
|
|
can_bubble: bool,
|
|
cancelable: bool,
|
|
detail: HandleValue) {
|
|
self.init_custom_event(Atom::from(type_), can_bubble, cancelable, detail)
|
|
}
|
|
|
|
// https://dom.spec.whatwg.org/#dom-event-istrusted
|
|
fn IsTrusted(&self) -> bool {
|
|
self.event.IsTrusted()
|
|
}
|
|
}
|