aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-10-30 15:58:26 -0700
committerBrian Anderson <banderson@mozilla.com>2012-10-30 15:58:26 -0700
commit0b9dfde34972f0b3a4ec1bdcc1141a376bcbf250 (patch)
tree19ea204978a1ba54ee60f3b5274f2b83351a0315
parentfbe17a1e361f1cb752e249528107364b7896d825 (diff)
downloadservo-0b9dfde34972f0b3a4ec1bdcc1141a376bcbf250.tar.gz
servo-0b9dfde34972f0b3a4ec1bdcc1141a376bcbf250.zip
Flatten the css module
-rw-r--r--src/servo/css/apply.rs (renamed from src/servo/css/resolve/apply.rs)0
-rw-r--r--src/servo/css/matching.rs (renamed from src/servo/css/resolve/matching.rs)0
-rw-r--r--src/servo/css/styles.rs2
-rwxr-xr-xsrc/servo/servo.rc6
4 files changed, 3 insertions, 5 deletions
diff --git a/src/servo/css/resolve/apply.rs b/src/servo/css/apply.rs
index dbd6f8b70d7..dbd6f8b70d7 100644
--- a/src/servo/css/resolve/apply.rs
+++ b/src/servo/css/apply.rs
diff --git a/src/servo/css/resolve/matching.rs b/src/servo/css/matching.rs
index c16f4f8a140..c16f4f8a140 100644
--- a/src/servo/css/resolve/matching.rs
+++ b/src/servo/css/matching.rs
diff --git a/src/servo/css/styles.rs b/src/servo/css/styles.rs
index af2ec6368db..fcc19880a02 100644
--- a/src/servo/css/styles.rs
+++ b/src/servo/css/styles.rs
@@ -174,5 +174,5 @@ impl Node : StyleMethods {
}
fn apply_style(layout_ctx: &LayoutContext, node: Node) {
- resolve::apply::apply_style(layout_ctx, node)
+ apply::apply_style(layout_ctx, node)
} \ No newline at end of file
diff --git a/src/servo/servo.rc b/src/servo/servo.rc
index 409177134ec..83ea5429f63 100755
--- a/src/servo/servo.rc
+++ b/src/servo/servo.rc
@@ -46,10 +46,8 @@ pub mod content {
pub mod css {
pub mod styles;
- mod resolve {
- pub mod apply;
- mod matching;
- }
+ mod apply;
+ mod matching;
}
pub mod layout {