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
74 lines
2.7 KiB
Rust
74 lines
2.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::CSSKeyframeRuleBinding::{self, CSSKeyframeRuleMethods};
|
|
use dom::bindings::inheritance::Castable;
|
|
use dom::bindings::reflector::{DomObject, reflect_dom_object};
|
|
use dom::bindings::root::{Dom, DomRoot, MutNullableDom};
|
|
use dom::bindings::str::DOMString;
|
|
use dom::cssrule::{CSSRule, SpecificCSSRule};
|
|
use dom::cssstyledeclaration::{CSSModificationAccess, CSSStyleDeclaration, CSSStyleOwner};
|
|
use dom::cssstylesheet::CSSStyleSheet;
|
|
use dom::window::Window;
|
|
use dom_struct::dom_struct;
|
|
use servo_arc::Arc;
|
|
use style::shared_lock::{Locked, ToCssWithGuard};
|
|
use style::stylesheets::keyframes_rule::Keyframe;
|
|
|
|
#[dom_struct]
|
|
pub struct CSSKeyframeRule {
|
|
cssrule: CSSRule,
|
|
#[ignore_malloc_size_of = "Arc"]
|
|
keyframerule: Arc<Locked<Keyframe>>,
|
|
style_decl: MutNullableDom<CSSStyleDeclaration>,
|
|
}
|
|
|
|
impl CSSKeyframeRule {
|
|
fn new_inherited(parent_stylesheet: &CSSStyleSheet, keyframerule: Arc<Locked<Keyframe>>)
|
|
-> CSSKeyframeRule {
|
|
CSSKeyframeRule {
|
|
cssrule: CSSRule::new_inherited(parent_stylesheet),
|
|
keyframerule: keyframerule,
|
|
style_decl: Default::default(),
|
|
}
|
|
}
|
|
|
|
#[allow(unrooted_must_root)]
|
|
pub fn new(window: &Window, parent_stylesheet: &CSSStyleSheet,
|
|
keyframerule: Arc<Locked<Keyframe>>) -> DomRoot<CSSKeyframeRule> {
|
|
reflect_dom_object(Box::new(CSSKeyframeRule::new_inherited(parent_stylesheet, keyframerule)),
|
|
window,
|
|
CSSKeyframeRuleBinding::Wrap)
|
|
}
|
|
}
|
|
|
|
impl CSSKeyframeRuleMethods for CSSKeyframeRule {
|
|
// https://drafts.csswg.org/css-animations/#dom-csskeyframerule-style
|
|
fn Style(&self) -> DomRoot<CSSStyleDeclaration> {
|
|
self.style_decl.or_init(|| {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
CSSStyleDeclaration::new(
|
|
self.global().as_window(),
|
|
CSSStyleOwner::CSSRule(
|
|
Dom::from_ref(self.upcast()),
|
|
self.keyframerule.read_with(&guard).block.clone(),
|
|
),
|
|
None,
|
|
CSSModificationAccess::ReadWrite,
|
|
)
|
|
})
|
|
}
|
|
}
|
|
|
|
impl SpecificCSSRule for CSSKeyframeRule {
|
|
fn ty(&self) -> u16 {
|
|
use dom::bindings::codegen::Bindings::CSSRuleBinding::CSSRuleConstants;
|
|
CSSRuleConstants::KEYFRAME_RULE
|
|
}
|
|
|
|
fn get_css(&self) -> DOMString {
|
|
let guard = self.cssrule.shared_lock().read();
|
|
self.keyframerule.read_with(&guard).to_css_string(&guard).into()
|
|
}
|
|
}
|