diff options
author | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-07-22 12:49:39 +0200 |
---|---|---|
committer | Emilio Cobos Álvarez <emilio@crisal.io> | 2019-07-23 23:09:55 +0200 |
commit | 3d57c22e9cda982923dd184152d3f187910d7b46 (patch) | |
tree | 51d07653ebd19e68626a5a0b442e8dde98c9dbd0 /components/script/dom/canvasrenderingcontext2d.rs | |
parent | 2ff7cb5a3749d65bb7b7a8f637d8196e316179c9 (diff) | |
download | servo-3d57c22e9cda982923dd184152d3f187910d7b46.tar.gz servo-3d57c22e9cda982923dd184152d3f187910d7b46.zip |
Update euclid.
There are a few canvas2d-related dependencies that haven't updated, but they
only use euclid internally so that's not blocking landing the rest of the
changes.
Given the size of this patch, I think it's useful to get this landed as-is.
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
-rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 039ff1039f9..2a8f14295c0 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -32,7 +32,10 @@ use canvas_traits::canvas::{RadialGradientStyle, RepetitionStyle}; use cssparser::Color as CSSColor; use cssparser::{Parser, ParserInput, RGBA}; use dom_struct::dom_struct; -use euclid::{vec2, Point2D, Rect, Size2D, Transform2D}; +use euclid::{ + default::{Point2D, Rect, Size2D, Transform2D}, + vec2, +}; use ipc_channel::ipc::{self, IpcSender}; use net_traits::image_cache::CanRequestImages; use net_traits::image_cache::ImageCache; @@ -1223,7 +1226,7 @@ impl CanvasState { let (sin, cos) = (angle.sin(), angle.cos()); let transform = self.state.borrow().transform; - self.state.borrow_mut().transform = transform.pre_mul(&Transform2D::row_major( + self.state.borrow_mut().transform = transform.pre_transform(&Transform2D::row_major( cos as f32, sin as f32, -sin as f32, @@ -1258,7 +1261,7 @@ impl CanvasState { } let transform = self.state.borrow().transform; - self.state.borrow_mut().transform = transform.pre_mul(&Transform2D::row_major( + self.state.borrow_mut().transform = transform.pre_transform(&Transform2D::row_major( a as f32, b as f32, c as f32, d as f32, e as f32, f as f32, )); self.update_transform() |