aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/canvasrenderingcontext2d.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2017-06-14 07:25:05 -0700
committerGitHub <noreply@github.com>2017-06-14 07:25:05 -0700
commit18653f69581693a5bae1ce4e350e78bc16159b08 (patch)
treec231afafc66f7f3e2404769e083c176d2a13057d /components/script/dom/canvasrenderingcontext2d.rs
parent5dce166266d1f74e2ae88dbe52ca5ced75c2349b (diff)
parent997608f11f6dfa79291ead25cae46a0538f2a3dc (diff)
downloadservo-18653f69581693a5bae1ce4e350e78bc16159b08.tar.gz
servo-18653f69581693a5bae1ce4e350e78bc16159b08.zip
Auto merge of #17184 - nical:euclid-bump, r=SimonSapin
Bump euclid to 0.14.x. - [x] `./mach build -d` does not report any errors (kinda, need webrender published and Cargo.toml fixed up) - [x] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because it is a refactoring in which the difference is mostly a compile-time/strong-typing thing with no change to the logic. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17184) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/canvasrenderingcontext2d.rs')
-rw-r--r--components/script/dom/canvasrenderingcontext2d.rs23
1 files changed, 10 insertions, 13 deletions
diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs
index 8fb17c90fea..7f08ba1c13a 100644
--- a/components/script/dom/canvasrenderingcontext2d.rs
+++ b/components/script/dom/canvasrenderingcontext2d.rs
@@ -34,10 +34,7 @@ use dom::htmlimageelement::HTMLImageElement;
use dom::imagedata::ImageData;
use dom::node::{document_from_node, Node, NodeDamage, window_from_node};
use dom_struct::dom_struct;
-use euclid::matrix2d::Matrix2D;
-use euclid::point::Point2D;
-use euclid::rect::Rect;
-use euclid::size::Size2D;
+use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D, vec2};
use ipc_channel::ipc::{self, IpcSender};
use net_traits::image::base::PixelFormat;
use net_traits::image_cache::ImageResponse;
@@ -82,7 +79,7 @@ struct CanvasContextState {
line_cap: LineCapStyle,
line_join: LineJoinStyle,
miter_limit: f64,
- transform: Matrix2D<f32>,
+ transform: Transform2D<f32>,
shadow_offset_x: f64,
shadow_offset_y: f64,
shadow_blur: f64,
@@ -102,7 +99,7 @@ impl CanvasContextState {
line_cap: LineCapStyle::Butt,
line_join: LineJoinStyle::Miter,
miter_limit: 10.0,
- transform: Matrix2D::identity(),
+ transform: Transform2D::identity(),
shadow_offset_x: 0.0,
shadow_offset_y: 0.0,
shadow_blur: 0.0,
@@ -559,7 +556,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
let transform = self.state.borrow().transform;
- self.state.borrow_mut().transform = transform.pre_scaled(x as f32, y as f32);
+ self.state.borrow_mut().transform = transform.pre_scale(x as f32, y as f32);
self.update_transform()
}
@@ -572,7 +569,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
let (sin, cos) = (angle.sin(), angle.cos());
let transform = self.state.borrow().transform;
self.state.borrow_mut().transform = transform.pre_mul(
- &Matrix2D::row_major(cos as f32, sin as f32,
+ &Transform2D::row_major(cos as f32, sin as f32,
-sin as f32, cos as f32,
0.0, 0.0));
self.update_transform()
@@ -585,7 +582,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
let transform = self.state.borrow().transform;
- self.state.borrow_mut().transform = transform.pre_translated(x as f32, y as f32);
+ self.state.borrow_mut().transform = transform.pre_translate(vec2(x as f32, y as f32));
self.update_transform()
}
@@ -598,7 +595,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
let transform = self.state.borrow().transform;
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));
+ &Transform2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32));
self.update_transform()
}
@@ -610,13 +607,13 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
}
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);
+ Transform2D::row_major(a as f32, b as f32, c as f32, d as f32, e as f32, f as f32);
self.update_transform()
}
// https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform
fn ResetTransform(&self) {
- self.state.borrow_mut().transform = Matrix2D::identity();
+ self.state.borrow_mut().transform = Transform2D::identity();
self.update_transform()
}
@@ -1079,7 +1076,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D {
dirty_width: Finite<f64>,
dirty_height: Finite<f64>) {
let data = imagedata.get_data_array();
- let offset = Point2D::new(*dx, *dy);
+ let offset = Vector2D::new(*dx, *dy);
let image_data_size = Size2D::new(imagedata.Width() as f64, imagedata.Height() as f64);
let dirty_rect = Rect::new(Point2D::new(*dirty_x, *dirty_y),