diff options
author | Ms2ger <ms2ger@gmail.com> | 2014-12-17 10:42:52 +0100 |
---|---|---|
committer | Josh Matthews <josh@joshmatthews.net> | 2014-12-17 15:19:45 -0500 |
commit | 466faac2a507c833b282e274a28f6ae533c628f9 (patch) | |
tree | 0022a66d52deec0081b8b721b56e2f15d7225f8e /components/layout/traversal.rs | |
parent | b8900782b0fcb409f37189bdc08eb7f8b3564a5f (diff) | |
download | servo-466faac2a507c833b282e274a28f6ae533c628f9.tar.gz servo-466faac2a507c833b282e274a28f6ae533c628f9.zip |
Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d.
Diffstat (limited to 'components/layout/traversal.rs')
-rw-r--r-- | components/layout/traversal.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 26036ea4d46..4b824160902 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -5,7 +5,7 @@ //! Traversals over the DOM and flow trees, running the layout computations. use css::node_style::StyledNode; -use css::matching::{ApplicableDeclarations, CannotShare, MatchMethods, StyleWasShared}; +use css::matching::{ApplicableDeclarations, MatchMethods, StyleSharingResult}; use construct::FlowConstructor; use context::LayoutContext; use flow::{Flow, MutableFlowUtils}; @@ -152,7 +152,7 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> { }; // Otherwise, match and cascade selectors. match sharing_result { - CannotShare(mut shareable) => { + StyleSharingResult::CannotShare(mut shareable) => { let mut applicable_declarations = ApplicableDeclarations::new(); if node.is_element() { @@ -178,7 +178,7 @@ impl<'a> PreorderDomTraversal for RecalcStyleForNode<'a> { style_sharing_candidate_cache.insert_if_possible(&node); } } - StyleWasShared(index, damage) => { + StyleSharingResult::StyleWasShared(index, damage) => { style_sharing_candidate_cache.touch(index); ThreadSafeLayoutNode::new(&node).set_restyle_damage(damage); } |