diff --git a/components/canvas/canvas_paint_thread.rs b/components/canvas/canvas_paint_thread.rs index 553171d0233..1429385ad28 100644 --- a/components/canvas/canvas_paint_thread.rs +++ b/components/canvas/canvas_paint_thread.rs @@ -231,10 +231,6 @@ impl<'a> CanvasPaintThread<'a> { Canvas2dMsg::SetLineDashOffset(offset) => { self.canvas(canvas_id).set_line_dash_offset(offset) }, - Canvas2dMsg::GetTransform(sender) => { - let transform = self.canvas(canvas_id).get_transform(); - sender.send(transform).unwrap(); - }, Canvas2dMsg::SetTransform(ref matrix) => self.canvas(canvas_id).set_transform(matrix), Canvas2dMsg::SetGlobalAlpha(alpha) => self.canvas(canvas_id).set_global_alpha(alpha), Canvas2dMsg::SetGlobalComposition(op) => { @@ -570,12 +566,6 @@ impl Canvas<'_> { } } - fn get_transform(&self) -> Transform2D { - match self { - Canvas::Raqote(canvas_data) => canvas_data.get_transform(), - } - } - fn put_image_data(&mut self, snapshot: Snapshot, rect: Rect) { match self { Canvas::Raqote(canvas_data) => canvas_data.put_image_data(snapshot, rect), diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs index f557075fd25..82fac313525 100644 --- a/components/script/canvas_state.rs +++ b/components/script/canvas_state.rs @@ -1965,10 +1965,7 @@ impl CanvasState { // https://html.spec.whatwg.org/multipage/#dom-context-2d-gettransform pub(crate) fn get_transform(&self, global: &GlobalScope, can_gc: CanGc) -> DomRoot { - let (sender, receiver) = ipc::channel::>().unwrap(); - self.send_canvas_2d_msg(Canvas2dMsg::GetTransform(sender)); - let transform = receiver.recv().unwrap(); - + let transform = self.state.borrow_mut().transform; DOMMatrix::new(global, true, transform.cast::().to_3d(), can_gc) } diff --git a/components/shared/canvas/canvas.rs b/components/shared/canvas/canvas.rs index f043ad26b9c..03db7aa2823 100644 --- a/components/shared/canvas/canvas.rs +++ b/components/shared/canvas/canvas.rs @@ -436,7 +436,6 @@ pub enum Canvas2dMsg { FillText(String, f64, f64, Option, FillOrStrokeStyle, bool), FillRect(Rect, FillOrStrokeStyle), GetImageData(Rect, Size2D, IpcSender), - GetTransform(IpcSender>), IsPointInCurrentPath(f64, f64, FillRule, IpcSender), LineTo(Point2D), MoveTo(Point2D),