diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-11-06 23:01:38 +0100 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-11-07 11:23:47 +0100 |
| commit | 8fc75704c972453804d8ec69184f584cd3313dc3 (patch) | |
| tree | f84f018b11aecd106a8ec62225ad41f21d768cbe /components/layout/css | |
| parent | 552a03fde66b5869d77892d52da4f2a3df3f4cdf (diff) | |
| download | servo-8fc75704c972453804d8ec69184f584cd3313dc3.tar.gz servo-8fc75704c972453804d8ec69184f584cd3313dc3.zip | |
Wrap SharedLayoutContext::new_animations_sender in a Mutex.
Diffstat (limited to 'components/layout/css')
| -rw-r--r-- | components/layout/css/matching.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs index 456f8cbe88f..d0260fa5c98 100644 --- a/components/layout/css/matching.rs +++ b/components/layout/css/matching.rs @@ -21,8 +21,8 @@ use smallvec::SmallVec; use std::borrow::ToOwned; use std::hash::{Hash, Hasher}; use std::slice::Iter; -use std::sync::Arc; use std::sync::mpsc::Sender; +use std::sync::{Arc, Mutex}; use string_cache::{Atom, Namespace}; use style::node::TElementAttributes; use style::properties::{ComputedValues, PropertyDeclaration, cascade}; @@ -406,7 +406,7 @@ pub trait MatchMethods { parent: Option<LayoutNode>, applicable_declarations: &ApplicableDeclarations, applicable_declarations_cache: &mut ApplicableDeclarationsCache, - new_animations_sender: &Sender<Animation>); + new_animations_sender: &Mutex<Sender<Animation>>); } trait PrivateMatchMethods { @@ -417,7 +417,7 @@ trait PrivateMatchMethods { style: &mut Option<Arc<ComputedValues>>, applicable_declarations_cache: &mut ApplicableDeclarationsCache, - new_animations_sender: &Sender<Animation>, + new_animations_sender: &Mutex<Sender<Animation>>, shareable: bool, animate_properties: bool) -> RestyleDamage; @@ -438,7 +438,7 @@ impl<'ln> PrivateMatchMethods for LayoutNode<'ln> { style: &mut Option<Arc<ComputedValues>>, applicable_declarations_cache: &mut ApplicableDeclarationsCache, - new_animations_sender: &Sender<Animation>, + new_animations_sender: &Mutex<Sender<Animation>>, shareable: bool, animate_properties: bool) -> RestyleDamage { @@ -655,7 +655,7 @@ impl<'ln> MatchMethods for LayoutNode<'ln> { parent: Option<LayoutNode>, applicable_declarations: &ApplicableDeclarations, applicable_declarations_cache: &mut ApplicableDeclarationsCache, - new_animations_sender: &Sender<Animation>) { + new_animations_sender: &Mutex<Sender<Animation>>) { // Get our parent's style. This must be unsafe so that we don't touch the parent's // borrow flags. // |