diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-01-30 15:27:53 -0700 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-01-30 15:27:53 -0700 |
commit | 172aed535be3c34775824dac64ad2b91fc379ad5 (patch) | |
tree | 265b0c050a6de594b5b55534bf5c3f5278493c94 /components/layout/inline.rs | |
parent | 49dc60cac1ef014621379bedf1fb41aeac34820e (diff) | |
parent | dfb5c52131738d15af9987aff02751fa212863f9 (diff) | |
download | servo-172aed535be3c34775824dac64ad2b91fc379ad5.tar.gz servo-172aed535be3c34775824dac64ad2b91fc379ad5.zip |
auto merge of #4757 : servo/servo/newnewnewcss, r=mbrubeck
(Still off by default. Enable with `RUST_LOG=style`.)
r? @mbrubeck
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r-- | components/layout/inline.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 45187d60c17..c1a518dbfe9 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -36,7 +36,7 @@ use std::ops::{Add, Sub, Mul, Div, Rem, Neg, Shl, Shr, Not, BitOr, BitAnd, BitXo use std::u16; use style::computed_values::{overflow, text_align, text_justify, text_overflow, vertical_align}; use style::computed_values::{white_space}; -use style::ComputedValues; +use style::properties::ComputedValues; use std::sync::Arc; // From gfxFontConstants.h in Firefox |