diff options
41 files changed, 63 insertions, 63 deletions
diff --git a/components/layout/animation.rs b/components/layout/animation.rs index 9147970f8cf..5330bfe1d39 100644 --- a/components/layout/animation.rs +++ b/components/layout/animation.rs @@ -14,7 +14,7 @@ use std::collections::HashMap; use std::sync::mpsc::Receiver; use style::animation::{Animation, update_style_for_animation}; use style::dom::TRestyleDamage; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; use style::timer::Timer; /// Processes any new animations that were discovered after style recalculation. diff --git a/components/layout/construct.rs b/components/layout/construct.rs index 26d47f95f05..5c4f1ce7849 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -51,9 +51,9 @@ use style::computed_values::position; use style::context::SharedStyleContext; use style::logical_geometry::Direction; use style::properties::{self, ServoComputedValues}; -use style::selector_impl::{PseudoElement, RestyleDamage}; -use style::selector_matching::Stylist; +use style::selector_parser::{PseudoElement, RestyleDamage}; use style::servo::restyle_damage::{BUBBLE_ISIZES, RECONSTRUCT_FLOW}; +use style::stylist::Stylist; use table::TableFlow; use table_caption::TableCaptionFlow; use table_cell::TableCellFlow; diff --git a/components/layout/flow.rs b/components/layout/flow.rs index fae309d2ae2..846ca510a87 100644 --- a/components/layout/flow.rs +++ b/components/layout/flow.rs @@ -53,7 +53,7 @@ use style::context::SharedStyleContext; use style::dom::TRestyleDamage; use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; use style::properties::ServoComputedValues; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::{RECONSTRUCT_FLOW, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, REPOSITION}; use style::values::computed::LengthOrPercentageOrAuto; use table::{ColumnComputedInlineSize, ColumnIntrinsicInlineSize, TableFlow}; diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 9b4ee750a45..104c45fd918 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -47,7 +47,7 @@ use style::context::SharedStyleContext; use style::dom::TRestyleDamage; use style::logical_geometry::{Direction, LogicalMargin, LogicalRect, LogicalSize, WritingMode}; use style::properties::ServoComputedValues; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::RECONSTRUCT_FLOW; use style::str::char_is_whitespace; use style::values::Either; diff --git a/components/layout/generated_content.rs b/components/layout/generated_content.rs index 0d8038a0348..d3eed080a8f 100644 --- a/components/layout/generated_content.rs +++ b/components/layout/generated_content.rs @@ -21,7 +21,7 @@ use style::computed_values::{display, list_style_type}; use style::computed_values::content::ContentItem; use style::dom::TRestyleDamage; use style::properties::ServoComputedValues; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::RESOLVE_GENERATED_CONTENT; use text::TextRunScanner; diff --git a/components/layout/incremental.rs b/components/layout/incremental.rs index 83c9a5f4ddb..e38f55bec08 100644 --- a/components/layout/incremental.rs +++ b/components/layout/incremental.rs @@ -5,7 +5,7 @@ use flow::{self, AFFECTS_COUNTERS, Flow, HAS_COUNTER_AFFECTING_CHILDREN, IS_ABSOLUTELY_POSITIONED}; use style::computed_values::float; use style::dom::TRestyleDamage; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::{REFLOW, RECONSTRUCT_FLOW}; bitflags! { diff --git a/components/layout/query.rs b/components/layout/query.rs index 706a8fb3855..09cb53aa2e2 100644 --- a/components/layout/query.rs +++ b/components/layout/query.rs @@ -32,8 +32,8 @@ use style::context::StyleContext; use style::logical_geometry::{WritingMode, BlockFlowDirection, InlineBaseDirection}; use style::properties::longhands::{display, position}; use style::properties::style_structs; -use style::selector_impl::PseudoElement; -use style::selector_matching::Stylist; +use style::selector_parser::PseudoElement; +use style::stylist::Stylist; use style_traits::ToCss; use style_traits::cursor::Cursor; use wrapper::{LayoutNodeHelpers, LayoutNodeLayoutData}; diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs index 849e7b2087a..f0ba10d9f55 100644 --- a/components/layout/traversal.rs +++ b/components/layout/traversal.rs @@ -16,7 +16,7 @@ use style::atomic_refcell::AtomicRefCell; use style::context::{LocalStyleContext, SharedStyleContext, StyleContext}; use style::data::ElementData; use style::dom::{StylingMode, TElement, TNode}; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; use style::servo::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPAINT}; use style::traversal::{DomTraversalContext, put_thread_local_bloom_filter}; use style::traversal::{recalc_style_at, remove_from_bloom_filter}; diff --git a/components/layout_thread/lib.rs b/components/layout_thread/lib.rs index add38e67dc3..5b9722d8a10 100644 --- a/components/layout_thread/lib.rs +++ b/components/layout_thread/lib.rs @@ -111,9 +111,9 @@ use style::error_reporting::{ParseErrorReporter, StdoutErrorReporter}; use style::logical_geometry::LogicalPoint; use style::media_queries::{Device, MediaType}; use style::parser::ParserContextExtraData; -use style::selector_matching::Stylist; use style::servo::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW, REPAINT, REPOSITION, STORE_OVERFLOW}; use style::stylesheets::{Origin, Stylesheet, UserAgentStylesheets}; +use style::stylist::Stylist; use style::thread_state; use style::timer::Timer; use util::geometry::max_rect; diff --git a/components/script/dom/bindings/trace.rs b/components/script/dom/bindings/trace.rs index cd4f469c119..8ecb06fdb1e 100644 --- a/components/script/dom/bindings/trace.rs +++ b/components/script/dom/bindings/trace.rs @@ -97,7 +97,7 @@ use style::attr::{AttrIdentifier, AttrValue, LengthOrPercentageOrAuto}; use style::element_state::*; use style::media_queries::MediaList; use style::properties::PropertyDeclarationBlock; -use style::selector_impl::{PseudoElement, Snapshot}; +use style::selector_parser::{PseudoElement, Snapshot}; use style::values::specified::Length; use time::Duration; use url::Origin as UrlOrigin; diff --git a/components/script/dom/cssstyledeclaration.rs b/components/script/dom/cssstyledeclaration.rs index 6af36d4614c..c6280597b17 100644 --- a/components/script/dom/cssstyledeclaration.rs +++ b/components/script/dom/cssstyledeclaration.rs @@ -18,7 +18,7 @@ use std::sync::Arc; use style::parser::ParserContextExtraData; use style::properties::{Shorthand, Importance, PropertyDeclarationBlock}; use style::properties::{is_supported_property, parse_one_declaration, parse_style_attribute}; -use style::selector_impl::PseudoElement; +use style::selector_parser::PseudoElement; use style_traits::ToCss; // http://dev.w3.org/csswg/cssom/#the-cssstyledeclaration-interface diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs index 7819c6e0d83..0bf77ccf73d 100644 --- a/components/script/dom/document.rs +++ b/components/script/dom/document.rs @@ -124,7 +124,7 @@ use std::time::{Duration, Instant}; use style::attr::AttrValue; use style::context::ReflowGoal; use style::restyle_hints::RestyleHint; -use style::selector_impl::{RestyleDamage, Snapshot}; +use style::selector_parser::{RestyleDamage, Snapshot}; use style::str::{split_html_space_chars, str_join}; use style::stylesheets::Stylesheet; use time; diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 8ee0f7b7912..f162a1b56a0 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -92,9 +92,9 @@ use style::properties::{DeclaredValue, Importance}; use style::properties::{PropertyDeclaration, PropertyDeclarationBlock, parse_style_attribute}; use style::properties::longhands::{background_image, border_spacing, font_family, font_size, overflow_x}; use style::restyle_hints::RESTYLE_SELF; -use style::selector_impl::{NonTSPseudoClass, RestyleDamage, ServoSelectorImpl}; -use style::selector_matching::ApplicableDeclarationBlock; +use style::selector_parser::{NonTSPseudoClass, RestyleDamage, ServoSelectorImpl}; use style::sink::Push; +use style::stylist::ApplicableDeclarationBlock; use style::values::CSSFloat; use style::values::specified::{self, CSSColor, CSSRGBA, LengthOrPercentage}; diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 883a87a3f16..251d459335e 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -83,7 +83,7 @@ use std::mem; use std::ops::Range; use std::sync::Arc; use style::dom::OpaqueNode; -use style::selector_impl::ServoSelectorImpl; +use style::selector_parser::ServoSelectorImpl; use style::stylesheets::Stylesheet; use style::thread_state; use uuid::Uuid; diff --git a/components/script/dom/window.rs b/components/script/dom/window.rs index a57ed1061e9..e5e85051c7c 100644 --- a/components/script/dom/window.rs +++ b/components/script/dom/window.rs @@ -92,7 +92,7 @@ use style::context::ReflowGoal; use style::error_reporting::ParseErrorReporter; use style::media_queries; use style::properties::longhands::overflow_x; -use style::selector_impl::PseudoElement; +use style::selector_parser::PseudoElement; use style::str::HTML_SPACE_CHARACTERS; use task_source::dom_manipulation::DOMManipulationTaskSource; use task_source::file_reading::FileReadingTaskSource; diff --git a/components/script/layout_wrapper.rs b/components/script/layout_wrapper.rs index d8af54b7b49..1c2bad81089 100644 --- a/components/script/layout_wrapper.rs +++ b/components/script/layout_wrapper.rs @@ -66,10 +66,10 @@ use style::dom::{LayoutIterator, NodeInfo, OpaqueNode, PresentationalHintsSynthe use style::dom::UnsafeNode; use style::element_state::*; use style::properties::{ComputedValues, PropertyDeclarationBlock}; -use style::selector_impl::{NonTSPseudoClass, PseudoElement, RestyleDamage, ServoSelectorImpl}; -use style::selector_matching::ApplicableDeclarationBlock; +use style::selector_parser::{NonTSPseudoClass, PseudoElement, RestyleDamage, ServoSelectorImpl}; use style::sink::Push; use style::str::is_whitespace; +use style::stylist::ApplicableDeclarationBlock; #[derive(Copy, Clone)] pub struct ServoLayoutNode<'a> { diff --git a/components/script_layout_interface/lib.rs b/components/script_layout_interface/lib.rs index 0ad5948f87f..5894e96049a 100644 --- a/components/script_layout_interface/lib.rs +++ b/components/script_layout_interface/lib.rs @@ -52,7 +52,7 @@ use std::sync::atomic::AtomicIsize; use style::atomic_refcell::AtomicRefCell; use style::data::ElementData; use style::dom::TRestyleDamage; -use style::selector_impl::RestyleDamage; +use style::selector_parser::RestyleDamage; pub struct PartialPersistentLayoutData { /// Data that the style system associates with a node. When the diff --git a/components/script_layout_interface/message.rs b/components/script_layout_interface/message.rs index 0f34a6bea75..06b661059b6 100644 --- a/components/script_layout_interface/message.rs +++ b/components/script_layout_interface/message.rs @@ -19,7 +19,7 @@ use servo_url::ServoUrl; use std::sync::Arc; use std::sync::mpsc::{Receiver, Sender}; use style::context::ReflowGoal; -use style::selector_impl::PseudoElement; +use style::selector_parser::PseudoElement; use style::stylesheets::Stylesheet; /// Asynchronous messages that script can send to layout. diff --git a/components/script_layout_interface/wrapper_traits.rs b/components/script_layout_interface/wrapper_traits.rs index 66b325ff9a1..e274bb27850 100644 --- a/components/script_layout_interface/wrapper_traits.rs +++ b/components/script_layout_interface/wrapper_traits.rs @@ -22,7 +22,7 @@ use style::data::ElementData; use style::dom::{LayoutIterator, NodeInfo, PresentationalHintsSynthetizer, TNode}; use style::dom::OpaqueNode; use style::properties::ServoComputedValues; -use style::selector_impl::{PseudoElement, PseudoElementCascadeType, RestyleDamage, ServoSelectorImpl}; +use style::selector_parser::{PseudoElement, PseudoElementCascadeType, RestyleDamage, ServoSelectorImpl}; #[derive(Copy, PartialEq, Clone, Debug)] pub enum PseudoElementType<T> { diff --git a/components/style/context.rs b/components/style/context.rs index 2707a799713..d5819555cf6 100644 --- a/components/style/context.rs +++ b/components/style/context.rs @@ -11,11 +11,11 @@ use error_reporting::ParseErrorReporter; use euclid::Size2D; use matching::StyleSharingCandidateCache; use parking_lot::RwLock; -use selector_matching::Stylist; use std::cell::RefCell; use std::collections::HashMap; use std::sync::{Arc, Mutex}; use std::sync::mpsc::Sender; +use stylist::Stylist; use timer::Timer; /// This structure is used to create a local style context from a shared one. diff --git a/components/style/data.rs b/components/style/data.rs index 6f4a34e90ca..9fc871c3bcf 100644 --- a/components/style/data.rs +++ b/components/style/data.rs @@ -6,7 +6,7 @@ use properties::ComputedValues; use rule_tree::StrongRuleNode; -use selector_impl::PseudoElement; +use selector_parser::PseudoElement; use std::collections::HashMap; use std::hash::BuildHasherDefault; use std::mem; diff --git a/components/style/dom.rs b/components/style/dom.rs index 7b15e820edf..605baed33a7 100644 --- a/components/style/dom.rs +++ b/components/style/dom.rs @@ -14,12 +14,12 @@ use parking_lot::RwLock; use properties::{ComputedValues, PropertyDeclarationBlock}; use properties::longhands::display::computed_value as display; use restyle_hints::{RESTYLE_DESCENDANTS, RESTYLE_LATER_SIBLINGS, RESTYLE_SELF, RestyleHint}; -use selector_impl::{ElementExt, PseudoElement, RestyleDamage}; -use selector_matching::ApplicableDeclarationBlock; +use selector_parser::{ElementExt, PseudoElement, RestyleDamage}; use sink::Push; use std::fmt::Debug; use std::ops::BitOr; use std::sync::Arc; +use stylist::ApplicableDeclarationBlock; use traversal::DomTraversalContext; use util::opts; diff --git a/components/style/gecko/data.rs b/components/style/gecko/data.rs index 2f6ed96c71f..da334bfa4bf 100644 --- a/components/style/gecko/data.rs +++ b/components/style/gecko/data.rs @@ -12,7 +12,6 @@ use media_queries::{Device, MediaType}; use num_cpus; use parking_lot::RwLock; use rayon; -use selector_matching::Stylist; use std::cmp; use std::collections::HashMap; use std::env; @@ -20,6 +19,7 @@ use std::sync::Arc; use std::sync::mpsc::{Receiver, Sender, channel}; use style_traits::ViewportPx; use stylesheets::Stylesheet; +use stylist::Stylist; pub struct PerDocumentStyleDataImpl { /// Rule processor. diff --git a/components/style/gecko/mod.rs b/components/style/gecko/mod.rs index ee462ef4b81..2e1e653f88e 100644 --- a/components/style/gecko/mod.rs +++ b/components/style/gecko/mod.rs @@ -12,5 +12,5 @@ pub mod traversal; pub mod wrapper; pub mod conversions; -pub mod selector_impl; +pub mod selector_parser; pub mod values; diff --git a/components/style/gecko/selector_impl.rs b/components/style/gecko/selector_parser.rs index bcd3a48158d..32125f0fa38 100644 --- a/components/style/gecko/selector_impl.rs +++ b/components/style/gecko/selector_parser.rs @@ -4,8 +4,8 @@ use cssparser::ToCss; use element_state::ElementState; -use selector_impl::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable}; -use selector_impl::PseudoElementCascadeType; +use selector_parser::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable}; +use selector_parser::PseudoElementCascadeType; use selectors::parser::{AttrSelector, ParserContext, SelectorImpl}; use std::fmt; use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace}; diff --git a/components/style/gecko/snapshot.rs b/components/style/gecko/snapshot.rs index f50f7c7edcc..21d310193c7 100644 --- a/components/style/gecko/snapshot.rs +++ b/components/style/gecko/snapshot.rs @@ -9,7 +9,7 @@ use gecko_bindings::bindings; use gecko_bindings::structs::ServoElementSnapshot; use gecko_bindings::structs::ServoElementSnapshotFlags as Flags; use restyle_hints::ElementSnapshot; -use selector_impl::TheSelectorImpl; +use selector_parser::TheSelectorImpl; use selectors::parser::AttrSelector; use string_cache::Atom; diff --git a/components/style/gecko/wrapper.rs b/components/style/gecko/wrapper.rs index 8dd2257461c..2ff798bb8ca 100644 --- a/components/style/gecko/wrapper.rs +++ b/components/style/gecko/wrapper.rs @@ -12,7 +12,7 @@ use dom::{OpaqueNode, PresentationalHintsSynthetizer}; use element_state::ElementState; use error_reporting::StdoutErrorReporter; use gecko::restyle_damage::GeckoRestyleDamage; -use gecko::selector_impl::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement}; +use gecko::selector_parser::{GeckoSelectorImpl, NonTSPseudoClass, PseudoElement}; use gecko::snapshot_helpers; use gecko_bindings::bindings; use gecko_bindings::bindings::{Gecko_DropStyleChildrenIterator, Gecko_MaybeCreateStyleChildrenIterator}; @@ -32,8 +32,7 @@ use parking_lot::RwLock; use parser::ParserContextExtraData; use properties::{ComputedValues, parse_style_attribute}; use properties::PropertyDeclarationBlock; -use selector_impl::ElementExt; -use selector_matching::ApplicableDeclarationBlock; +use selector_parser::ElementExt; use selectors::Element; use selectors::parser::{AttrSelector, NamespaceConstraint}; use servo_url::ServoUrl; @@ -42,6 +41,7 @@ use std::fmt; use std::ptr; use std::sync::Arc; use string_cache::{Atom, Namespace, WeakAtom, WeakNamespace}; +use stylist::ApplicableDeclarationBlock; // Important: We don't currently refcount the DOM, because the wrapper lifetime // magic guarantees that our LayoutFoo references won't outlive the root, and diff --git a/components/style/lib.rs b/components/style/lib.rs index 3fca994960c..68a8ef46d40 100644 --- a/components/style/lib.rs +++ b/components/style/lib.rs @@ -114,8 +114,8 @@ pub mod parser; pub mod refcell; pub mod restyle_hints; pub mod rule_tree; -pub mod selector_impl; -pub mod selector_matching; +pub mod selector_parser; +pub mod stylist; #[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod servo; pub mod sequential; pub mod sink; diff --git a/components/style/matching.rs b/components/style/matching.rs index ca799af62c0..b08746a16cc 100644 --- a/components/style/matching.rs +++ b/components/style/matching.rs @@ -17,8 +17,7 @@ use dom::{TElement, TNode, TRestyleDamage, UnsafeNode}; use properties::{CascadeFlags, ComputedValues, SHAREABLE, cascade}; use properties::longhands::display::computed_value as display; use rule_tree::StrongRuleNode; -use selector_impl::{PseudoElement, RestyleDamage, TheSelectorImpl}; -use selector_matching::ApplicableDeclarationBlock; +use selector_parser::{PseudoElement, RestyleDamage, TheSelectorImpl}; use selectors::MatchAttr; use selectors::bloom::BloomFilter; use selectors::matching::{AFFECTED_BY_PSEUDO_ELEMENTS, MatchingReason, StyleRelations}; @@ -28,6 +27,7 @@ use std::hash::BuildHasherDefault; use std::mem; use std::slice::IterMut; use std::sync::Arc; +use stylist::ApplicableDeclarationBlock; use util::opts; fn create_common_style_affecting_attributes_from_element<E: TElement>(element: &E) diff --git a/components/style/parser.rs b/components/style/parser.rs index 5b29834df1a..61921a2cd30 100644 --- a/components/style/parser.rs +++ b/components/style/parser.rs @@ -8,7 +8,7 @@ use cssparser::{Parser, SourcePosition}; use error_reporting::ParseErrorReporter; #[cfg(feature = "gecko")] use gecko_bindings::sugar::refptr::{GeckoArcPrincipal, GeckoArcURI}; -use selector_impl::TheSelectorImpl; +use selector_parser::TheSelectorImpl; use selectors::parser::ParserContext as SelectorParserContext; use servo_url::ServoUrl; use stylesheets::Origin; diff --git a/components/style/restyle_hints.rs b/components/style/restyle_hints.rs index c2e4da3dede..df2891f5a52 100644 --- a/components/style/restyle_hints.rs +++ b/components/style/restyle_hints.rs @@ -8,7 +8,7 @@ use Atom; use element_state::*; #[cfg(feature = "servo")] use heapsize::HeapSizeOf; -use selector_impl::{AttrValue, ElementExt, NonTSPseudoClass, Snapshot, TheSelectorImpl}; +use selector_parser::{AttrValue, ElementExt, NonTSPseudoClass, Snapshot, TheSelectorImpl}; use selectors::{Element, MatchAttr}; use selectors::matching::{MatchingReason, StyleRelations}; use selectors::matching::matches_complex_selector; diff --git a/components/style/selector_impl.rs b/components/style/selector_parser.rs index 85734d51387..b2d55c6551b 100644 --- a/components/style/selector_impl.rs +++ b/components/style/selector_parser.rs @@ -11,19 +11,19 @@ use selectors::parser::{AttrSelector, SelectorImpl}; pub type AttrValue = <TheSelectorImpl as SelectorImpl>::AttrValue; #[cfg(feature = "servo")] -pub use servo::selector_impl::*; +pub use servo::selector_parser::*; #[cfg(feature = "gecko")] -pub use gecko::selector_impl::*; +pub use gecko::selector_parser::*; #[cfg(feature = "servo")] -pub use servo::selector_impl::ServoSelectorImpl as TheSelectorImpl; +pub use servo::selector_parser::ServoSelectorImpl as TheSelectorImpl; #[cfg(feature = "gecko")] -pub use gecko::selector_impl::GeckoSelectorImpl as TheSelectorImpl; +pub use gecko::selector_parser::GeckoSelectorImpl as TheSelectorImpl; #[cfg(feature = "servo")] -pub use servo::selector_impl::ServoElementSnapshot as Snapshot; +pub use servo::selector_parser::ServoElementSnapshot as Snapshot; #[cfg(feature = "gecko")] pub use gecko::snapshot::GeckoElementSnapshot as Snapshot; diff --git a/components/style/servo/mod.rs b/components/style/servo/mod.rs index bd3db996eff..fd7f1b7c566 100644 --- a/components/style/servo/mod.rs +++ b/components/style/servo/mod.rs @@ -3,4 +3,4 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ pub mod restyle_damage; -pub mod selector_impl; +pub mod selector_parser; diff --git a/components/style/servo/selector_impl.rs b/components/style/servo/selector_parser.rs index 9e5516da9cc..defdbf3b129 100644 --- a/components/style/servo/selector_impl.rs +++ b/components/style/servo/selector_parser.rs @@ -7,8 +7,8 @@ use attr::{AttrIdentifier, AttrValue}; use cssparser::ToCss; use element_state::ElementState; use restyle_hints::ElementSnapshot; -use selector_impl::{ElementExt, PseudoElementCascadeType, TheSelectorImpl}; -use selector_impl::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable}; +use selector_parser::{ElementExt, PseudoElementCascadeType, TheSelectorImpl}; +use selector_parser::{attr_equals_selector_is_shareable, attr_exists_selector_is_shareable}; use selectors::{Element, MatchAttrGeneric}; use selectors::parser::{AttrSelector, ParserContext, SelectorImpl}; use std::fmt; diff --git a/components/style/stylesheets.rs b/components/style/stylesheets.rs index 60b4ba9ec6d..9b97c98a084 100644 --- a/components/style/stylesheets.rs +++ b/components/style/stylesheets.rs @@ -16,7 +16,7 @@ use media_queries::{Device, MediaList, parse_media_query_list}; use parking_lot::RwLock; use parser::{ParserContext, ParserContextExtraData, log_css_error}; use properties::{PropertyDeclarationBlock, parse_property_declaration_list}; -use selector_impl::TheSelectorImpl; +use selector_parser::TheSelectorImpl; use selectors::parser::{Selector, parse_selector_list}; use servo_url::ServoUrl; use std::cell::Cell; diff --git a/components/style/selector_matching.rs b/components/style/stylist.rs index c574c097a5a..de106e7a3de 100644 --- a/components/style/selector_matching.rs +++ b/components/style/stylist.rs @@ -16,7 +16,7 @@ use properties::{PropertyDeclaration, PropertyDeclarationBlock}; use quickersort::sort_by; use restyle_hints::{RestyleHint, DependencySet}; use rule_tree::{RuleTree, StrongRuleNode, StyleSource}; -use selector_impl::{ElementExt, TheSelectorImpl, PseudoElement, Snapshot}; +use selector_parser::{ElementExt, TheSelectorImpl, PseudoElement, Snapshot}; use selectors::Element; use selectors::bloom::BloomFilter; use selectors::matching::{AFFECTED_BY_STYLE_ATTRIBUTE, AFFECTED_BY_PRESENTATIONAL_HINTS}; diff --git a/docs/components/style.md b/docs/components/style.md index 8a1b4fac2d4..55c5f8f97f7 100644 --- a/docs/components/style.md +++ b/docs/components/style.md @@ -138,21 +138,21 @@ that you didn't find it here so it can be added :) [wiki-styling-overview]: https://github.com/servo/servo/wiki/Styling-overview [stylo]: https://public.etherpad-mozilla.org/p/stylo [selector-impl]: http://doc.servo.org/selectors/parser/trait.SelectorImpl.html -[selector-impl-ext]: http://doc.servo.org/style/selector_impl/trait.SelectorImplExt.html -[servo-selector-impl]: http://doc.servo.org/style/servo_selector_impl/struct.ServoSelectorImpl.html +[selector-impl-ext]: http://doc.servo.org/style/selector_parser/trait.SelectorImplExt.html +[servo-selector-impl]: http://doc.servo.org/style/servo_selector_parser/struct.ServoSelectorImpl.html [tree-structural-pseudo-classes]: https://www.w3.org/TR/selectors4/#structural-pseudos [style-dom-traits]: http://doc.servo.org/style/dom/index.html [layout-wrapper]: http://doc.servo.org/layout/wrapper/index.html -[pseudo-cascade-type]: http://doc.servo.org/style/selector_impl/enum.PseudoElementCascadeType.html -[servo-pseudo-elements]: http://doc.servo.org/style/selector_impl/enum.PseudoElement.html +[pseudo-cascade-type]: http://doc.servo.org/style/selector_parser/enum.PseudoElementCascadeType.html +[servo-pseudo-elements]: http://doc.servo.org/style/selector_parser/enum.PseudoElement.html [mdn-pseudo-before]: https://developer.mozilla.org/en/docs/Web/CSS/::before [mdn-pseudo-after]: https://developer.mozilla.org/en/docs/Web/CSS/::after [mdn-pseudo-selection]: https://developer.mozilla.org/en/docs/Web/CSS/::selection -[stylist]: http://doc.servo.org/style/selector_matching/struct.Stylist.html +[stylist]: http://doc.servo.org/style/stylist/struct.Stylist.html [selectors-selectormap]: http://doc.servo.org/selectors/matching/struct.SelectorMap.html [selectors-rule]: http://doc.servo.org/selectors/matching/struct.Rule.html -[per-pseudo-selectormap]: http://doc.servo.org/style/selector_matching/struct.PerPseudoElementSelectorMap.html -[per-origin-selectormap]: http://doc.servo.org/style/selector_matching/struct.PerOriginSelectorMap.html +[per-pseudo-selectormap]: http://doc.servo.org/style/stylist/struct.PerPseudoElementSelectorMap.html +[per-origin-selectormap]: http://doc.servo.org/style/stylist/struct.PerOriginSelectorMap.html [docs-pipeline]: https://github.com/servo/servo/blob/master/docs/glossary.md#pipeline [properties-module]: http://doc.servo.org/style/properties/index.html [properties-cascade-fn]: http://doc.servo.org/style/properties/fn.cascade.html diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 763170ba8fe..37a69ed07c8 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -16,7 +16,7 @@ use style::context::{LocalStyleContextCreationInfo, ReflowGoal, SharedStyleConte use style::dom::{NodeInfo, StylingMode, TElement, TNode}; use style::error_reporting::StdoutErrorReporter; use style::gecko::data::{NUM_THREADS, PerDocumentStyleData}; -use style::gecko::selector_impl::{GeckoSelectorImpl, PseudoElement}; +use style::gecko::selector_parser::{GeckoSelectorImpl, PseudoElement}; use style::gecko::snapshot::GeckoElementSnapshot; use style::gecko::traversal::RecalcStyleOnly; use style::gecko::wrapper::{GeckoElement, GeckoNode}; @@ -42,7 +42,7 @@ use style::parser::{ParserContext, ParserContextExtraData}; use style::properties::{CascadeFlags, ComputedValues, Importance, PropertyDeclaration}; use style::properties::{PropertyDeclarationParseResult, PropertyDeclarationBlock}; use style::properties::{apply_declarations, parse_one_declaration}; -use style::selector_impl::PseudoElementCascadeType; +use style::selector_parser::PseudoElementCascadeType; use style::sequential; use style::string_cache::Atom; use style::stylesheets::{Origin, Stylesheet}; diff --git a/tests/unit/style/lib.rs b/tests/unit/style/lib.rs index 7367c5a0d8b..1ca7414bf68 100644 --- a/tests/unit/style/lib.rs +++ b/tests/unit/style/lib.rs @@ -28,9 +28,9 @@ mod media_queries; mod owning_handle; mod parsing; mod properties; -mod selector_matching; mod str; mod stylesheets; +mod stylist; mod value; mod viewport; diff --git a/tests/unit/style/parsing/selectors.rs b/tests/unit/style/parsing/selectors.rs index f7cb562c274..2c8f1800b98 100644 --- a/tests/unit/style/parsing/selectors.rs +++ b/tests/unit/style/parsing/selectors.rs @@ -4,7 +4,7 @@ use cssparser::{Parser, ToCss}; use selectors::parser::{Selector, ParserContext, parse_selector_list}; -use style::selector_impl::TheSelectorImpl; +use style::selector_parser::TheSelectorImpl; fn parse(input: &mut Parser) -> Result<Selector<TheSelectorImpl>, ()> { let mut context = ParserContext::new(); diff --git a/tests/unit/style/selector_matching.rs b/tests/unit/style/stylist.rs index aba2778fbb7..a9d427b96dc 100644 --- a/tests/unit/style/selector_matching.rs +++ b/tests/unit/style/stylist.rs @@ -10,8 +10,8 @@ use servo_atoms::Atom; use std::sync::Arc; use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, DeclaredValue}; use style::properties::{longhands, Importance}; -use style::selector_matching::{Rule, SelectorMap}; use style::stylesheets::StyleRule; +use style::stylist::{Rule, SelectorMap}; use style::thread_state; /// Helper method to get some Rules from selector strings. |