Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 00:05:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1631154 - Remove WeakRuleNode::clone. r=emilio

Browse Source 
MallocSizeOf for RuleTree should not keep around weak references in
case someone runs a GC meanwhile.
This commit is contained in:
Anthony Ramine 2020-04-16 15:56:09 +02:00 committed by Emilio Cobos Álvarez
parent f71e5d7ef4
commit a8dec99fc8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
servo/components/style/rule_tree/core.rs
View File

@ -71,14 +71,14 @@ impl MallocSizeOf for RuleTree {
fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize {
let mut n = 0;
let mut stack = SmallVec::<[_; 32]>::new();
stack.push(self.root.downgrade());
stack.push(self.root.clone());
while let Some(node) = stack.pop() {
n += unsafe { ops.malloc_size_of(node.ptr()) };
let children = unsafe { (*node.ptr()).children.read() };
children.shallow_size_of(ops);
for c in &*children {
stack.push(c.clone());
stack.push(c.upgrade());
}
}
@ -335,7 +335,6 @@ impl RuleNode {
}
}
#[derive(Clone)]
pub(crate) struct WeakRuleNode {
p: ptr::NonNull<RuleNode>,
}