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

Use StyleArc in the style system.

Browse source 
MozReview-Commit-ID: flF0fv9E9M
This commit is contained in:
Bobby Holley 2017-04-30 15:18:01 -07:00
parent 6d8fc600b8
commit d78ca4c4f9
37 changed files with 49 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -6,15 +6,14 @@
//! The rule tree.
use arc_ptr_eq;
#[cfg(feature = "servo")]
use heapsize::HeapSizeOf;
use properties::{Importance, PropertyDeclarationBlock};
use shared_lock::{Locked, StylesheetGuards, SharedRwLockReadGuard};
use std::io::{self, Write};
use std::ptr;
use std::sync::Arc;
use std::sync::atomic::{AtomicPtr, AtomicUsize, Ordering};
use stylearc::Arc;
use stylesheets::StyleRule;
use thread_state;
@ -65,8 +64,8 @@ impl StyleSource {
fn ptr_equals(&self, other: &Self) -> bool {
use self::StyleSource::*;
match (self, other) {
(&Style(ref one), &Style(ref other)) => arc_ptr_eq(one, other),
(&Declarations(ref one), &Declarations(ref other)) => arc_ptr_eq(one, other),
(&Style(ref one), &Style(ref other)) => Arc::ptr_eq(one, other),
(&Declarations(ref one), &Declarations(ref other)) => Arc::ptr_eq(one, other),
_ => false,
}
}
@ -203,7 +202,7 @@ impl RuleTree {
// so let's skip it for now.
let is_here_already = match current.get().source.as_ref() {
Some(&StyleSource::Declarations(ref already_here)) => {
arc_ptr_eq(pdb, already_here)
Arc::ptr_eq(pdb, already_here)
},
_ => unreachable!("Replacing non-declarations style?"),
};