auto merge of #4757 : servo/servo/newnewnewcss, r=mbrubeck

(Still off by default. Enable with `RUST_LOG=style`.)

r? @mbrubeck 

1 files changed, 4 insertions, 3 deletions

diff --git a/components/layout/display_list_builder.rs b/components/layout/display_list_builder.rs
index 1c81e65459b..6ec6f4a317b 100644
--- a/components/layout/display_list_builder.rs
+++ b/components/layout/display_list_builder.rs
@@ -47,12 +47,13 @@ use std::default::Default;
 use std::iter::repeat;
 use std::num::Float;
 use style::values::specified::{AngleOrCorner, HorizontalDirection, VerticalDirection};
-use style::computed::{Image, LinearGradient, LengthOrPercentage};
+use style::values::computed::{Image, LinearGradient, LengthOrPercentage};
+use style::values::RGBA;
 use style::computed_values::filter::Filter;
 use style::computed_values::{background_attachment, background_repeat, border_style, overflow};
 use style::computed_values::{position, visibility};
-use style::style_structs::Border;
-use style::{ComputedValues, RGBA};
+use style::properties::style_structs::Border;
+use style::properties::ComputedValues;
 use std::num::ToPrimitive;
 use std::sync::Arc;
 use std::sync::mpsc::channel;