diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2015-06-10 14:14:24 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2015-06-10 14:14:24 -0700 |
| commit | 053296e1319239fbfe2842edb31bbf46eb8f28d7 (patch) | |
| tree | 219c49f7f1a24b0165d1517e9a095adbe6b26035 /components/layout | |
| parent | 8c943b30ce4759b038b5ae581159481b8a92e801 (diff) | |
| parent | 8fb29c91e6010d6baec5e0e7e60fba5ea55ff870 (diff) | |
| download | servo-053296e1319239fbfe2842edb31bbf46eb8f28d7.tar.gz servo-053296e1319239fbfe2842edb31bbf46eb8f28d7.zip | |
Merge pull request #6329 from glennw/remove-generic
Updates for changes in rust-geom and rust-layers
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/model.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/layout/model.rs b/components/layout/model.rs index ad6dd66cf17..b5adaf1a681 100644 --- a/components/layout/model.rs +++ b/components/layout/model.rs @@ -426,11 +426,11 @@ pub fn padding_from_style(style: &ComputedValues, containing_block_inline_size: } pub trait ToGfxMatrix { - fn to_gfx_matrix(&self) -> Matrix4<f32>; + fn to_gfx_matrix(&self) -> Matrix4; } impl ToGfxMatrix for ComputedMatrix { - fn to_gfx_matrix(&self) -> Matrix4<f32> { + fn to_gfx_matrix(&self) -> Matrix4 { Matrix4 { m11: self.m11 as f32, m12: self.m12 as f32, m13: self.m13 as f32, m14: self.m14 as f32, m21: self.m21 as f32, m22: self.m22 as f32, m23: self.m23 as f32, m24: self.m24 as f32, |