diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2016-07-19 20:29:22 +0200 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2016-07-20 08:42:40 +0200 |
commit | 789807b7b09e0742a197c98efd2f81b85b751a57 (patch) | |
tree | e093027760cf23719d9f6b3e279eab46e9b3168f /components/style/selector_matching.rs | |
parent | b2a7e4437391abd92486d5bef879fadadabab162 (diff) | |
download | servo-789807b7b09e0742a197c98efd2f81b85b751a57.tar.gz servo-789807b7b09e0742a197c98efd2f81b85b751a57.zip |
Remove the ComputedValue traits and style_struct_traits
Diffstat (limited to 'components/style/selector_matching.rs')
-rw-r--r-- | components/style/selector_matching.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/style/selector_matching.rs b/components/style/selector_matching.rs index 14f37cbcda8..14ad1b279f0 100644 --- a/components/style/selector_matching.rs +++ b/components/style/selector_matching.rs @@ -9,7 +9,7 @@ use element_state::*; use error_reporting::StdoutErrorReporter; use keyframes::KeyframesAnimation; use media_queries::{Device, MediaType}; -use properties::{self, PropertyDeclaration, PropertyDeclarationBlock}; +use properties::{self, PropertyDeclaration, PropertyDeclarationBlock, ComputedValuesStruct}; use restyle_hints::{ElementSnapshot, RestyleHint, DependencySet}; use selector_impl::SelectorImplExt; use selectors::bloom::BloomFilter; @@ -231,8 +231,8 @@ impl<Impl: SelectorImplExt> Stylist<Impl> { /// universal rules and applying them. pub fn precomputed_values_for_pseudo(&self, pseudo: &Impl::PseudoElement, - parent: Option<&Arc<Impl::ComputedValues>>) - -> Option<Arc<Impl::ComputedValues>> { + parent: Option<&Arc<ComputedValuesStruct>>) + -> Option<Arc<ComputedValuesStruct>> { debug_assert!(Impl::pseudo_element_cascade_type(pseudo).is_precomputed()); if let Some(declarations) = self.precomputed_pseudo_element_decls.get(pseudo) { let (computed, _) = @@ -250,8 +250,8 @@ impl<Impl: SelectorImplExt> Stylist<Impl> { pub fn lazily_compute_pseudo_element_style<E>(&self, element: &E, pseudo: &Impl::PseudoElement, - parent: &Arc<Impl::ComputedValues>) - -> Option<Arc<Impl::ComputedValues>> + parent: &Arc<ComputedValuesStruct>) + -> Option<Arc<ComputedValuesStruct>> where E: Element<Impl=Impl, AttrString=Impl::AttrString> + PresentationalHintsSynthetizer { debug_assert!(Impl::pseudo_element_cascade_type(pseudo).is_lazy()); |