aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom
diff options
context:
space:
mode:
authorAnthony Ramine <n.oxyde@gmail.com>2016-08-19 17:13:23 +0200
committerAnthony Ramine <n.oxyde@gmail.com>2016-08-21 03:03:45 +0200
commit51768844ed797a1c9c3597415a0f78d43b5f0b0b (patch)
treee7718ce0efdac7e0ad649f644295107f26e9c405 /components/script/dom
parent8a75810eba22a76b78ca2ef4db64f946013f780f (diff)
downloadservo-51768844ed797a1c9c3597415a0f78d43b5f0b0b.tar.gz
servo-51768844ed797a1c9c3597415a0f78d43b5f0b0b.zip
Update euclid to 0.10.1
Diffstat (limited to 'components/script/dom')
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs27
1 files changed, 10 insertions, 17 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 1c6f83651d1..09d4a8f04e1 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -573,7 +573,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
let transform = self.state.borrow().transform;
- self.state.borrow_mut().transform = transform.scale(x as f32, y as f32);
+ self.state.borrow_mut().transform = transform.pre_scaled(x as f32, y as f32);
self.update_transform()
}
@@ -585,9 +585,10 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
let (sin, cos) = (angle.sin(), angle.cos());
let transform = self.state.borrow().transform;
- self.state.borrow_mut().transform = transform.mul(&Matrix2D::new(cos as f32, sin as f32,
- -sin as f32, cos as f32,
- 0.0, 0.0));
+ self.state.borrow_mut().transform = transform.pre_mul(
+ &Matrix2D::row_major(cos as f32, sin as f32,
+ -sin as f32, cos as f32,
+ 0.0, 0.0));
self.update_transform()
}
@@ -598,7 +599,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
let transform = self.state.borrow().transform;
- self.state.borrow_mut().transform = transform.translate(x as f32, y as f32);
+ self.state.borrow_mut().transform = transform.pre_translated(x as f32, y as f32);
self.update_transform()
}
@@ -610,12 +611,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
let transform = self.state.borrow().transform;
- self.state.borrow_mut().transform = transform.mul(&Matrix2D::new(a as f32,
- b as f32,
- c as f32,
- d as f32,
- e as f32,
- f as f32));
+ self.state.borrow_mut().transform = transform.pre_mul(
+ &Matrix2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32));
self.update_transform()
}
@@ -626,12 +623,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
return;
}
- self.state.borrow_mut().transform = Matrix2D::new(a as f32,
- b as f32,
- c as f32,
- d as f32,
- e as f32,
- f as f32);
+ self.state.borrow_mut().transform =
+ Matrix2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32);
self.update_transform()
}