aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout
diff options
context:
space:
mode:
Diffstat (limited to 'components/layout')
-rw-r--r--components/layout/Cargo.toml3
-rw-r--r--components/layout/css/matching.rs8
-rw-r--r--components/layout/lib.rs1
-rw-r--r--components/layout/traversal.rs2
-rw-r--r--components/layout/wrapper.rs2
5 files changed, 10 insertions, 6 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml
index b24e2c2562c..5447ff64047 100644
--- a/components/layout/Cargo.toml
+++ b/components/layout/Cargo.toml
@@ -43,6 +43,9 @@ path = "../util"
[dependencies.cssparser]
git = "https://github.com/servo/rust-cssparser"
+[dependencies.selectors]
+git = "https://github.com/servo/rust-selectors"
+
[dependencies.geom]
git = "https://github.com/servo/rust-geom"
diff --git a/components/layout/css/matching.rs b/components/layout/css/matching.rs
index 31c14804d6b..cc6147cce46 100644
--- a/components/layout/css/matching.rs
+++ b/components/layout/css/matching.rs
@@ -12,7 +12,7 @@ use util::{LayoutDataAccess, LayoutDataWrapper};
use wrapper::{LayoutElement, LayoutNode, TLayoutNode};
use script::dom::node::NodeTypeId;
-use servo_util::bloom::BloomFilter;
+use selectors::bloom::BloomFilter;
use servo_util::cache::{LRUCache, SimpleHashCache};
use servo_util::smallvec::{SmallVec, SmallVec16};
use servo_util::arc_ptr_eq;
@@ -21,12 +21,12 @@ use std::mem;
use std::hash::{Hash, Hasher, Writer};
use std::slice::Iter;
use string_cache::{Atom, Namespace};
-use style::selectors::PseudoElement;
+use selectors::parser::PseudoElement;
use style::selector_matching::{Stylist, DeclarationBlock};
use style::node::{TElement, TNode};
use style::properties::{ComputedValues, cascade};
-use style::selector_matching::{CommonStyleAffectingAttributeMode, CommonStyleAffectingAttributes};
-use style::selector_matching::{common_style_affecting_attributes, rare_style_affecting_attributes};
+use selectors::matching::{CommonStyleAffectingAttributeMode, CommonStyleAffectingAttributes};
+use selectors::matching::{common_style_affecting_attributes, rare_style_affecting_attributes};
use std::sync::Arc;
pub struct ApplicableDeclarations {
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 44f8f49c056..837945eff81 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -41,6 +41,7 @@ extern crate style;
extern crate "plugins" as servo_plugins;
extern crate net;
extern crate msg;
+extern crate selectors;
#[macro_use]
extern crate "util" as servo_util;
diff --git a/components/layout/traversal.rs b/components/layout/traversal.rs
index 3ec4aa1bb53..2211cf2fcce 100644
--- a/components/layout/traversal.rs
+++ b/components/layout/traversal.rs
@@ -18,7 +18,7 @@ use wrapper::{layout_node_to_unsafe_layout_node, LayoutNode};
use wrapper::{PostorderNodeMutTraversal, ThreadSafeLayoutNode, UnsafeLayoutNode};
use wrapper::{PreorderDomTraversal, PostorderDomTraversal};
-use servo_util::bloom::BloomFilter;
+use selectors::bloom::BloomFilter;
use servo_util::opts;
use servo_util::tid::tid;
use style::node::TNode;
diff --git a/components/layout/wrapper.rs b/components/layout/wrapper.rs
index 102dfb15f79..54f341d1d09 100644
--- a/components/layout/wrapper.rs
+++ b/components/layout/wrapper.rs
@@ -68,7 +68,7 @@ use std::mem;
use std::sync::mpsc::Sender;
use string_cache::{Atom, Namespace};
use style::computed_values::{content, display, white_space};
-use style::selectors::{NamespaceConstraint, AttrSelector};
+use selectors::parser::{NamespaceConstraint, AttrSelector};
use style::legacy::{LengthAttribute, SimpleColorAttribute, UnsignedIntegerAttribute, IntegerAttribute};
use style::node::{TElement, TElementAttributes, TNode};
use style::properties::PropertyDeclarationBlock;