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

servo_arc cleanups for publishing.

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D6034
This commit is contained in:
Manish Goregaokar 2018-09-18 09:19:18 +00:00 • committed by Emilio Cobos Álvarez
parent 22da3c22a2
commit 84ca681a78
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 229 additions and 154 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/rule_tree/mod.rs
View file

@ -12,7 +12,7 @@ use gecko::selector_parser::PseudoElement;
#[cfg(feature = "gecko")]
use malloc_size_of::{MallocSizeOf, MallocSizeOfOps};
use properties::{Importance, LonghandIdSet, PropertyDeclarationBlock};
use servo_arc::{Arc, ArcBorrow, ArcUnion, ArcUnionBorrow, NonZeroPtrMut};
use servo_arc::{Arc, ArcBorrow, ArcUnion, ArcUnionBorrow};
use shared_lock::{Locked, SharedRwLockReadGuard, StylesheetGuards};
use smallvec::SmallVec;
use std::io::{self, Write};
@ -942,15 +942,17 @@ impl MallocSizeOf for RuleNode {
#[derive(Clone)]
struct WeakRuleNode {
p: NonZeroPtrMut<RuleNode>,
p: ptr::NonNull<RuleNode>,
}
/// A strong reference to a rule node.
#[derive(Debug, Eq, Hash, PartialEq)]
pub struct StrongRuleNode {
p: NonZeroPtrMut<RuleNode>,
p: ptr::NonNull<RuleNode>,
}
unsafe impl Send for StrongRuleNode {}
#[cfg(feature = "servo")]
malloc_size_of_is_0!(StrongRuleNode);
@ -968,7 +970,7 @@ impl StrongRuleNode {
fn from_ptr(ptr: *mut RuleNode) -> Self {
StrongRuleNode {
p: NonZeroPtrMut::new(ptr),
p: ptr::NonNull::new(ptr).expect("Pointer must not be null"),
}
}
@ -1052,7 +1054,7 @@ impl StrongRuleNode {
/// Raw pointer to the RuleNode
pub fn ptr(&self) -> *mut RuleNode {
self.p.ptr()
self.p.as_ptr()
}
fn get(&self) -> &RuleNode {
@ -1665,12 +1667,12 @@ impl WeakRuleNode {
fn from_ptr(ptr: *mut RuleNode) -> Self {
WeakRuleNode {
p: NonZeroPtrMut::new(ptr),
p: ptr::NonNull::new(ptr).expect("Pointer must not be null"),
}
}
fn ptr(&self) -> *mut RuleNode {
self.p.ptr()
self.p.as_ptr()
}
}