aboutsummaryrefslogtreecommitdiffstats
path: root/components/style/gecko/traversal.rs
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2017-03-18 00:47:08 +0100
committerSimon Sapin <simon.sapin@exyr.org>2017-03-19 22:30:37 +0100
commitaeffca2a5900ebcf91063e9c7771b642817cb6bd (patch)
tree35a2a3513088fa303d96ed522d5c12eb29d6518c /components/style/gecko/traversal.rs
parent57724e5a3755a757e502658094dfda171c78ba78 (diff)
downloadservo-aeffca2a5900ebcf91063e9c7771b642817cb6bd.tar.gz
servo-aeffca2a5900ebcf91063e9c7771b642817cb6bd.zip
Replace RwLock<StyleRule> with Locked<StyleRule>
Diffstat (limited to 'components/style/gecko/traversal.rs')
-rw-r--r--components/style/gecko/traversal.rs13
1 files changed, 7 insertions, 6 deletions
diff --git a/components/style/gecko/traversal.rs b/components/style/gecko/traversal.rs
index 3cb7f30cb1b..7a68f66c75f 100644
--- a/components/style/gecko/traversal.rs
+++ b/components/style/gecko/traversal.rs
@@ -13,14 +13,14 @@ use traversal::{DomTraversal, PerLevelTraversalData, TraversalDriver, recalc_sty
/// This is the simple struct that Gecko uses to encapsulate a DOM traversal for
/// styling.
-pub struct RecalcStyleOnly {
- shared: SharedStyleContext,
+pub struct RecalcStyleOnly<'a> {
+ shared: SharedStyleContext<'a>,
driver: TraversalDriver,
}
-impl RecalcStyleOnly {
+impl<'a> RecalcStyleOnly<'a> {
/// Create a `RecalcStyleOnly` traversal from a `SharedStyleContext`.
- pub fn new(shared: SharedStyleContext, driver: TraversalDriver) -> Self {
+ pub fn new(shared: SharedStyleContext<'a>, driver: TraversalDriver) -> Self {
RecalcStyleOnly {
shared: shared,
driver: driver,
@@ -28,10 +28,11 @@ impl RecalcStyleOnly {
}
}
-impl<'le> DomTraversal<GeckoElement<'le>> for RecalcStyleOnly {
+impl<'recalc, 'le> DomTraversal<GeckoElement<'le>> for RecalcStyleOnly<'recalc> {
type ThreadLocalContext = ThreadLocalStyleContext<GeckoElement<'le>>;
- fn process_preorder(&self, traversal_data: &mut PerLevelTraversalData,
+ fn process_preorder(&self,
+ traversal_data: &mut PerLevelTraversalData,
thread_local: &mut Self::ThreadLocalContext,
node: GeckoNode<'le>)
{