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

Use an Arc for eager pseudo styles.

Browse source 
MozReview-Commit-ID: BdYkXxYvUQ3
This commit is contained in:
Bobby Holley 2017-06-23 13:43:15 -07:00
parent af89c74ab7
commit eeb62edfea
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/style/data.rs
View file

@ -99,10 +99,14 @@ impl RestyleData {
} }
} }
/// A list of styles for eagerly-cascaded pseudo-elements. /// A lazily-allocated list of styles for eagerly-cascaded pseudo-elements.
/// Lazily-allocated. ///
/// We use an Arc so that sharing these styles via the style sharing cache does
/// not require duplicate allocations. We leverage the copy-on-write semantics of
/// Arc::make_mut(), which is free (i.e. does not require atomic RMU operations)
/// in servo_arc.
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub struct EagerPseudoStyles(Option<Box<EagerPseudoArray>>); pub struct EagerPseudoStyles(Option<Arc<EagerPseudoArray>>);
#[derive(Debug, Default)] #[derive(Debug, Default)]
struct EagerPseudoArray(EagerPseudoArrayInner); struct EagerPseudoArray(EagerPseudoArrayInner);
@ -156,7 +160,10 @@ impl EagerPseudoStyles {
/// Returns a mutable reference to the style for a given eager pseudo, if it exists. /// Returns a mutable reference to the style for a given eager pseudo, if it exists.
pub fn get_mut(&mut self, pseudo: &PseudoElement) -> Option<&mut Arc<ComputedValues>> { pub fn get_mut(&mut self, pseudo: &PseudoElement) -> Option<&mut Arc<ComputedValues>> {
debug_assert!(pseudo.is_eager()); debug_assert!(pseudo.is_eager());
self.0.as_mut().and_then(|p| p[pseudo.eager_index()].as_mut()) match self.0 {
None => return None,
Some(ref mut arc) => Arc::make_mut(arc)[pseudo.eager_index()].as_mut(),
}
} }
/// Returns true if the EagerPseudoStyles has the style for |pseudo|. /// Returns true if the EagerPseudoStyles has the style for |pseudo|.
@ -167,9 +174,10 @@ impl EagerPseudoStyles {
/// Sets the style for the eager pseudo. /// Sets the style for the eager pseudo.
pub fn set(&mut self, pseudo: &PseudoElement, value: Arc<ComputedValues>) { pub fn set(&mut self, pseudo: &PseudoElement, value: Arc<ComputedValues>) {
if self.0.is_none() { if self.0.is_none() {
self.0 = Some(Box::new(Default::default())); self.0 = Some(Arc::new(Default::default()));
} }
self.0.as_mut().unwrap()[pseudo.eager_index()] = Some(value); let arr = Arc::make_mut(self.0.as_mut().unwrap());
arr[pseudo.eager_index()] = Some(value);
} }
/// Inserts a pseudo-element. The pseudo-element must not already exist. /// Inserts a pseudo-element. The pseudo-element must not already exist.
@ -180,9 +188,9 @@ impl EagerPseudoStyles {
/// Removes a pseudo-element style if it exists, and returns it. /// Removes a pseudo-element style if it exists, and returns it.
pub fn take(&mut self, pseudo: &PseudoElement) -> Option<Arc<ComputedValues>> { pub fn take(&mut self, pseudo: &PseudoElement) -> Option<Arc<ComputedValues>> {
let result = match self.0.as_mut() { let result = match self.0 {
None => return None, None => return None,
Some(arr) => arr[pseudo.eager_index()].take(), Some(ref mut arc) => Arc::make_mut(arc)[pseudo.eager_index()].take(),
}; };
let empty = self.0.as_ref().unwrap().iter().all(|x| x.is_none()); let empty = self.0.as_ref().unwrap().iter().all(|x| x.is_none());
if empty { if empty {