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/util.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/util.rs')
| -rw-r--r-- | components/layout/util.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/util.rs b/components/layout/util.rs index 206590d7c23..e04bbfbbd7e 100644 --- a/components/layout/util.rs +++ b/components/layout/util.rs @@ -17,7 +17,7 @@ use script::layout_interface::{LayoutChan, TrustedNodeAddress}; use script_traits::UntrustedNodeAddress; use std::mem; use std::cell::{Ref, RefMut}; -use style::ComputedValues; +use style::properties::ComputedValues; use style; use std::sync::Arc; @@ -176,7 +176,7 @@ pub trait ToGfxColor { fn to_gfx_color(&self) -> gfx::color::Color; } -impl ToGfxColor for style::computed_values::RGBA { +impl ToGfxColor for style::values::RGBA { fn to_gfx_color(&self) -> gfx::color::Color { gfx::color::rgba(self.red, self.green, self.blue, self.alpha) } |