diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2016-08-18 18:54:36 +0200 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2016-08-21 03:40:30 +0200 |
commit | 4062899fd8ff98e54a683f79e6d491bd916d841e (patch) | |
tree | 5ae8b69e724893aaf980b1bdeb87ddd71d6c5151 /components/script/layout_wrapper.rs | |
parent | bc71e8b65b1da3959c28d820a7bc54725118bcef (diff) | |
download | servo-4062899fd8ff98e54a683f79e6d491bd916d841e.tar.gz servo-4062899fd8ff98e54a683f79e6d491bd916d841e.zip |
Import SelectorMap back from the selectors crate.
Nobody else uses it, and I want to make breaking changes to it.
Diffstat (limited to 'components/script/layout_wrapper.rs')
-rw-r--r-- | components/script/layout_wrapper.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index 431fe55f9b0..b4e54fe5bd9 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -47,7 +47,7 @@ use script_layout_interface::wrapper_traits::{DangerousThreadSafeLayoutNode, Lay use script_layout_interface::wrapper_traits::{ThreadSafeLayoutNode, ThreadSafeLayoutElement}; use script_layout_interface::{HTMLCanvasData, LayoutNodeType, TrustedNodeAddress}; use script_layout_interface::{OpaqueStyleAndLayoutData, PartialStyleAndLayoutData}; -use selectors::matching::{DeclarationBlock, ElementFlags}; +use selectors::matching::ElementFlags; use selectors::parser::{AttrSelector, NamespaceConstraint}; use std::fmt; use std::marker::PhantomData; @@ -60,9 +60,10 @@ use style::context::SharedStyleContext; use style::data::PrivateStyleData; use style::dom::{PresentationalHintsSynthetizer, OpaqueNode, TDocument, TElement, TNode, UnsafeNode}; use style::element_state::*; -use style::properties::{ComputedValues, PropertyDeclaration, PropertyDeclarationBlock}; +use style::properties::{ComputedValues, PropertyDeclarationBlock}; use style::refcell::{Ref, RefCell, RefMut}; use style::selector_impl::{ElementSnapshot, NonTSPseudoClass, PseudoElement, ServoSelectorImpl}; +use style::selector_matching::DeclarationBlock; use style::sink::Push; use style::str::is_whitespace; use url::Url; @@ -418,7 +419,7 @@ impl<'le> fmt::Debug for ServoLayoutElement<'le> { impl<'le> PresentationalHintsSynthetizer for ServoLayoutElement<'le> { fn synthesize_presentational_hints_for_legacy_attributes<V>(&self, hints: &mut V) - where V: Push<DeclarationBlock<Vec<PropertyDeclaration>>> + where V: Push<DeclarationBlock> { unsafe { self.element.synthesize_presentational_hints_for_legacy_attributes(hints); @@ -1070,5 +1071,5 @@ impl<'le> ::selectors::Element for ServoThreadSafeLayoutElement<'le> { impl<'le> PresentationalHintsSynthetizer for ServoThreadSafeLayoutElement<'le> { fn synthesize_presentational_hints_for_legacy_attributes<V>(&self, _hints: &mut V) - where V: Push<DeclarationBlock<Vec<PropertyDeclaration>>> {} + where V: Push<DeclarationBlock> {} } |