diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-06-10 16:05:20 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-06-10 16:05:20 -0600 |
| commit | 752e03a502413f21cfb30e55d68110c50e034da6 (patch) | |
| tree | 219c49f7f1a24b0165d1517e9a095adbe6b26035 /components/layout | |
| parent | 93a45c91d16c0ae2c6b7e507f66a7267206772ac (diff) | |
| parent | 899ab226def56eb1c0abe533f4200da0a4a01691 (diff) | |
| download | servo-752e03a502413f21cfb30e55d68110c50e034da6.tar.gz servo-752e03a502413f21cfb30e55d68110c50e034da6.zip | |
Auto merge of #6331 - glennw:remove-generic-again, r=pcwalton
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6331)
<!-- Reviewable:end -->
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, |