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

Backed out changeset 4c5f2e282204 (bug 1729421) for bc failures

Browse Source
This commit is contained in:
criss 2021-09-14 17:42:03 +03:00
parent 56e3aa0a0f
commit 54043ff723
1 changed files with 3 additions and 2 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

@ -66,7 +66,7 @@ impl MallocSizeOf for RuleTree {
}
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
struct ChildKey(ptr::NonNull<()>);
struct ChildKey(CascadeLevel, ptr::NonNull<()>);
unsafe impl Send for ChildKey {}
unsafe impl Sync for ChildKey {}
@ -346,6 +346,7 @@ impl RuleNode {
fn key(&self) -> ChildKey {
ChildKey(
self.level,
self.source
.as_ref()
.expect("Called key() on the root node")
@ -566,7 +567,7 @@ impl StrongRuleNode {
source,
);
let key = ChildKey(source.key());
let key = ChildKey(level, source.key());
let children = self.p.children.upgradable_read();
if let Some(child) = children.get(&key, |node| node.p.key()) {
// Sound to call because we read-locked the parent's children.