diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-14 07:25:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 07:25:05 -0700 |
| commit | 18653f69581693a5bae1ce4e350e78bc16159b08 (patch) | |
| tree | c231afafc66f7f3e2404769e083c176d2a13057d /components/canvas_traits/lib.rs | |
| parent | 5dce166266d1f74e2ae88dbe52ca5ced75c2349b (diff) | |
| parent | 997608f11f6dfa79291ead25cae46a0538f2a3dc (diff) | |
| download | servo-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/canvas_traits/lib.rs')
| -rw-r--r-- | components/canvas_traits/lib.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/components/canvas_traits/lib.rs b/components/canvas_traits/lib.rs index 3d74b84f475..3a143001d10 100644 --- a/components/canvas_traits/lib.rs +++ b/components/canvas_traits/lib.rs @@ -16,10 +16,7 @@ extern crate ipc_channel; extern crate webrender_traits; use cssparser::RGBA; -use euclid::matrix2d::Matrix2D; -use euclid::point::Point2D; -use euclid::rect::Rect; -use euclid::size::Size2D; +use euclid::{Transform2D, Point2D, Vector2D, Rect, Size2D}; use ipc_channel::ipc::IpcSender; use std::default::Default; use std::str::FromStr; @@ -87,7 +84,7 @@ pub enum Canvas2dMsg { IsPointInPath(f64, f64, FillRule, IpcSender<bool>), LineTo(Point2D<f32>), MoveTo(Point2D<f32>), - PutImageData(Vec<u8>, Point2D<f64>, Size2D<f64>, Rect<f64>), + PutImageData(Vec<u8>, Vector2D<f64>, Size2D<f64>, Rect<f64>), QuadraticCurveTo(Point2D<f32>, Point2D<f32>), Rect(Rect<f32>), RestoreContext, @@ -102,7 +99,7 @@ pub enum Canvas2dMsg { SetMiterLimit(f32), SetGlobalAlpha(f32), SetGlobalComposition(CompositionOrBlending), - SetTransform(Matrix2D<f32>), + SetTransform(Transform2D<f32>), SetShadowOffsetX(f64), SetShadowOffsetY(f64), SetShadowBlur(f64), |