Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 06:00:15 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change Map::get_or_insert_with to Map::entry

Browse source
This commit is contained in:
Anthony Ramine 2020-04-20 14:11:45 +02:00
parent 306e8ac5f9
commit 1c2de5641c
2 changed files with 66 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

43
components/style/rule_tree/core.rs
View file

@ -13,11 +13,10 @@ use smallvec::SmallVec;
use std::fmt;
use std::hash;
use std::io::Write;
use std::mem;
use std::ptr;
use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
use super::map::Map;
use super::map::{Entry, Map};
use super::unsafe_box::UnsafeBox;
use super::{CascadeLevel, StyleSource};
@ -402,33 +401,21 @@ impl StrongRuleNode {
return child.upgrade();
}
let mut children = RwLockUpgradableReadGuard::upgrade(children);
let mut is_new = false;
let weak = {
let is_new = &mut is_new;
children.get_or_insert_with(
key,
|node| node.p.key(),
move || {
*is_new = true;
let root = unsafe { root.downgrade() };
let strong = StrongRuleNode::new(Box::new(RuleNode::new(
root,
self.clone(),
source,
level,
)));
let weak = unsafe { strong.downgrade() };
mem::forget(strong);
weak
},
)
};
if !is_new {
return weak.upgrade();
match children.entry(key, |node| node.p.key()) {
Entry::Occupied(child) => {
child.upgrade()
},
Entry::Vacant(entry) => {
let node = StrongRuleNode::new(Box::new(RuleNode::new(
unsafe { root.downgrade() },
self.clone(),
source,
level,
)));
entry.insert(unsafe { node.downgrade() });
node
},
}
unsafe { StrongRuleNode::from_unsafe_box(UnsafeBox::clone(&weak.p)) }
}
/// Get the style source corresponding to this rule node. May return `None`