Skip to content

Commit 7b90373

Browse files
emilioemilio
committed
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.
1 parent 370cf44 commit 7b90373

129 files changed

Lines changed: 638 additions & 543 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Cargo.lock‎

Lines changed: 85 additions & 56 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎components/canvas/Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ azure = {git = "https://github.com/servo/rust-azure", optional = true}
2121
byteorder = "1"
2222
canvas_traits = {path = "../canvas_traits"}
2323
cssparser = "0.25"
24-
euclid = "0.19"
24+
euclid = "0.20"
2525
fnv = "1.0"
2626
gleam = "0.6.7"
2727
half = "1"
2828
ipc-channel = "0.11"
2929
log = "0.4"
3030
num-traits = "0.2"
31-
offscreen_gl_context = {version = "0.22", features = ["serde", "osmesa"]}
31+
offscreen_gl_context = {version = "0.23", features = ["serde", "osmesa"]}
3232
raqote = {git = "https://github.com/jrmuizel/raqote", optional = true}
3333
pixels = {path = "../pixels"}
3434
serde_bytes = "0.10"

‎components/canvas/azure_backend.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use azure::azure_hl::{CapStyle, JoinStyle};
1616
use azure::azure_hl::{LinearGradientPattern, RadialGradientPattern};
1717
use canvas_traits::canvas::*;
1818
use cssparser::RGBA;
19-
use euclid::{Point2D, Rect, Size2D, Transform2D, Vector2D};
19+
use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D};
2020

2121
pub struct AzureBackend;
2222

‎components/canvas/canvas_data.rs‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@
55
use crate::canvas_paint_thread::AntialiasMode;
66
use canvas_traits::canvas::*;
77
use cssparser::RGBA;
8-
use euclid::{Point2D, Rect, Size2D, Transform2D, Vector2D};
8+
use euclid::default::{Point2D, Rect, Size2D, Transform2D, Vector2D};
99
use ipc_channel::ipc::{IpcSender, IpcSharedMemory};
1010
use num_traits::ToPrimitive;
1111
#[allow(unused_imports)]
1212
use std::marker::PhantomData;
1313
use std::mem;
1414
use std::sync::Arc;
1515
use webrender::api::DirtyRect;
16+
use webrender_api::units::RectExt;
1617

1718
/// The canvas data stores a state machine for the current status of
1819
/// the path data and any relevant transformations that are
@@ -123,12 +124,12 @@ struct PathBuilderRef<'a> {
123124

124125
impl<'a> PathBuilderRef<'a> {
125126
fn line_to(&self, pt: &Point2D<f32>) {
126-
let pt = self.transform.transform_point(pt);
127+
let pt = self.transform.transform_point(*pt);
127128
self.builder.line_to(pt);
128129
}
129130

130131
fn move_to(&self, pt: &Point2D<f32>) {
131-
let pt = self.transform.transform_point(pt);
132+
let pt = self.transform.transform_point(*pt);
132133
self.builder.move_to(pt);
133134
}
134135

@@ -142,32 +143,30 @@ impl<'a> PathBuilderRef<'a> {
142143
),
143144
Point2D::new(rect.origin.x, rect.origin.y + rect.size.height),
144145
);
145-
self.builder.move_to(self.transform.transform_point(&first));
146-
self.builder
147-
.line_to(self.transform.transform_point(&second));
148-
self.builder.line_to(self.transform.transform_point(&third));
149-
self.builder
150-
.line_to(self.transform.transform_point(&fourth));
146+
self.builder.move_to(self.transform.transform_point(first));
147+
self.builder.line_to(self.transform.transform_point(second));
148+
self.builder.line_to(self.transform.transform_point(third));
149+
self.builder.line_to(self.transform.transform_point(fourth));
151150
self.builder.close();
152151
}
153152

154153
fn quadratic_curve_to(&self, cp: &Point2D<f32>, endpoint: &Point2D<f32>) {
155154
self.builder.quadratic_curve_to(
156-
&self.transform.transform_point(cp),
157-
&self.transform.transform_point(endpoint),
155+
&self.transform.transform_point(*cp),
156+
&self.transform.transform_point(*endpoint),
158157
)
159158
}
160159

161160
fn bezier_curve_to(&self, cp1: &Point2D<f32>, cp2: &Point2D<f32>, endpoint: &Point2D<f32>) {
162161
self.builder.bezier_curve_to(
163-
&self.transform.transform_point(cp1),
164-
&self.transform.transform_point(cp2),
165-
&self.transform.transform_point(endpoint),
162+
&self.transform.transform_point(*cp1),
163+
&self.transform.transform_point(*cp2),
164+
&self.transform.transform_point(*endpoint),
166165
)
167166
}
168167

169168
fn arc(&self, center: &Point2D<f32>, radius: f32, start_angle: f32, end_angle: f32, ccw: bool) {
170-
let center = self.transform.transform_point(center);
169+
let center = self.transform.transform_point(*center);
171170
self.builder
172171
.arc(center, radius, start_angle, end_angle, ccw);
173172
}
@@ -182,7 +181,7 @@ impl<'a> PathBuilderRef<'a> {
182181
end_angle: f32,
183182
ccw: bool,
184183
) {
185-
let center = self.transform.transform_point(center);
184+
let center = self.transform.transform_point(*center);
186185
self.builder.ellipse(
187186
center,
188187
radius_x,
@@ -200,7 +199,7 @@ impl<'a> PathBuilderRef<'a> {
200199
None => return None,
201200
};
202201
let current_point = self.builder.get_current_point();
203-
Some(inverse.transform_point(&Point2D::new(current_point.x, current_point.y)))
202+
Some(inverse.transform_point(Point2D::new(current_point.x, current_point.y)))
204203
}
205204
}
206205

@@ -1033,7 +1032,7 @@ impl<'a> CanvasData<'a> {
10331032
);
10341033
let matrix = Transform2D::identity()
10351034
.pre_translate(-source_rect.origin.to_vector().cast())
1036-
.pre_mul(&self.state.transform);
1035+
.pre_transform(&self.state.transform);
10371036
draw_target.set_transform(&matrix);
10381037
draw_target
10391038
}

‎components/canvas/canvas_paint_thread.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
use crate::canvas_data::*;
66
use canvas_traits::canvas::*;
7-
use euclid::Size2D;
7+
use euclid::default::Size2D;
88
use ipc_channel::ipc::{self, IpcSender};
99
use std::borrow::ToOwned;
1010
use std::collections::HashMap;

‎components/canvas/gl_context.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use super::webgl_thread::{GLState, WebGLImpl};
66
use canvas_traits::webgl::{
77
GLContextAttributes, GLLimits, WebGLCommand, WebGLCommandBacktrace, WebGLVersion,
88
};
9-
use euclid::Size2D;
9+
use euclid::default::Size2D;
1010
use gleam::gl;
1111
use offscreen_gl_context::{
1212
ColorAttachmentType, DrawBuffer, GLContext, GLContextAttributes as RawGLContextAttributes,

‎components/canvas/webgl_mode/inprocess.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use canvas_traits::webgl::webgl_channel;
88
use canvas_traits::webgl::DOMToTextureCommand;
99
use canvas_traits::webgl::{WebGLChan, WebGLContextId, WebGLMsg, WebGLPipeline, WebGLReceiver};
1010
use canvas_traits::webgl::{WebGLSender, WebVRCommand, WebVRRenderHandler};
11-
use euclid::Size2D;
11+
use euclid::default::Size2D;
1212
use fnv::FnvHashMap;
1313
use gleam::gl;
1414
use servo_config::pref;

‎components/canvas/webgl_thread.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
use super::gl_context::{map_attrs_to_script_attrs, GLContextFactory, GLContextWrapper};
66
use byteorder::{ByteOrder, NativeEndian, WriteBytesExt};
77
use canvas_traits::webgl::*;
8-
use euclid::Size2D;
8+
use euclid::default::Size2D;
99
use fnv::FnvHashMap;
1010
use gleam::gl;
1111
use half::f16;

‎components/canvas_traits/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ webgl_backtrace = []
1515

1616
[dependencies]
1717
cssparser = "0.25"
18-
euclid = "0.19"
18+
euclid = "0.20"
1919
ipc-channel = "0.11"
2020
gleam = "0.6.7"
2121
lazy_static = "1"

‎components/canvas_traits/canvas.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
44

55
use cssparser::RGBA;
6-
use euclid::{Point2D, Rect, Size2D, Transform2D};
6+
use euclid::default::{Point2D, Rect, Size2D, Transform2D};
77
use ipc_channel::ipc::{IpcBytesReceiver, IpcBytesSender, IpcSender, IpcSharedMemory};
88
use serde_bytes::ByteBuf;
99
use std::default::Default;

0 commit comments

Comments
 (0)