From 1d7bb1337d3fc4355ea0296d17a2f196541ad7d0 Mon Sep 17 00:00:00 2001 From: Samson <16504129+sagudev@users.noreply.github.com> Date: Sun, 23 Feb 2025 17:31:06 +0100 Subject: [PATCH] Unify `(Offscreen)CanvasRenderingContext2d` and make `PaintRenderingContext2D` standalone (#35619) Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com> --- components/script/canvas_context.rs | 8 + .../script/dom/canvasrenderingcontext2d.rs | 102 +++----- components/script/dom/offscreencanvas.rs | 11 +- .../dom/offscreencanvasrenderingcontext2d.rs | 240 ++++++++---------- .../script/dom/paintrenderingcontext2d.rs | 162 ++++++------ .../script_bindings/codegen/CodegenRust.py | 4 +- 6 files changed, 237 insertions(+), 290 deletions(-) diff --git a/components/script/canvas_context.rs b/components/script/canvas_context.rs index 74855781805..62e104d720f 100644 --- a/components/script/canvas_context.rs +++ b/components/script/canvas_context.rs @@ -11,6 +11,7 @@ use script_layout_interface::{HTMLCanvasData, HTMLCanvasDataSource}; use crate::dom::bindings::codegen::UnionTypes::HTMLCanvasElementOrOffscreenCanvas; use crate::dom::bindings::inheritance::Castable; +use crate::dom::htmlcanvaselement::HTMLCanvasElement; use crate::dom::node::{Node, NodeDamage}; pub(crate) trait LayoutCanvasRenderingContextHelpers { @@ -74,4 +75,11 @@ impl HTMLCanvasElementOrOffscreenCanvas { HTMLCanvasElementOrOffscreenCanvas::OffscreenCanvas(canvas) => canvas.get_size(), } } + + pub(crate) fn canvas(&self) -> Option<&HTMLCanvasElement> { + match self { + HTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(canvas) => Some(canvas), + HTMLCanvasElementOrOffscreenCanvas::OffscreenCanvas(canvas) => canvas.placeholder(), + } + } } diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index f696cc301dd..2801a4f4ce5 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -23,7 +23,7 @@ use crate::dom::bindings::codegen::UnionTypes::{ use crate::dom::bindings::error::{ErrorResult, Fallible}; use crate::dom::bindings::num::Finite; use crate::dom::bindings::reflector::{reflect_dom_object, DomGlobal, Reflector}; -use crate::dom::bindings::root::{Dom, DomRoot, LayoutDom}; +use crate::dom::bindings::root::{DomRoot, LayoutDom}; use crate::dom::bindings::str::DOMString; use crate::dom::canvasgradient::CanvasGradient; use crate::dom::canvaspattern::CanvasPattern; @@ -38,21 +38,19 @@ use crate::script_runtime::CanGc; #[dom_struct] pub(crate) struct CanvasRenderingContext2D { reflector_: Reflector, - /// For rendering contexts created by an HTML canvas element, this is Some, - /// for ones created by a paint worklet, this is None. - canvas: Option>, + canvas: HTMLCanvasElementOrOffscreenCanvas, canvas_state: CanvasState, } impl CanvasRenderingContext2D { pub(crate) fn new_inherited( global: &GlobalScope, - canvas: Option<&HTMLCanvasElement>, + canvas: HTMLCanvasElementOrOffscreenCanvas, size: Size2D, ) -> CanvasRenderingContext2D { CanvasRenderingContext2D { reflector_: Reflector::new(), - canvas: canvas.map(Dom::from_ref), + canvas, canvas_state: CanvasState::new( global, Size2D::new(size.width as u64, size.height as u64), @@ -68,7 +66,7 @@ impl CanvasRenderingContext2D { ) -> DomRoot { let boxed = Box::new(CanvasRenderingContext2D::new_inherited( global, - Some(canvas), + HTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(DomRoot::from_ref(canvas)), size, )); reflect_dom_object(boxed, global, can_gc) @@ -112,18 +110,17 @@ impl CanvasRenderingContext2D { Point2D::new(rect.origin.x as u64, rect.origin.y as u64), Size2D::new(rect.size.width as u64, rect.size.height as u64), ); - self.canvas_state.get_rect( - self.canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size().to_u64()), - rect, - ) + self.canvas_state.get_rect(self.canvas.size(), rect) } pub(crate) fn send_data(&self, sender: IpcSender) { let msg = CanvasMsg::FromLayout(FromLayoutMsg::SendData(sender), self.get_canvas_id()); let _ = self.canvas_state.get_ipc_renderer().send(msg); } + + pub(crate) fn get_ipc_renderer(&self) -> IpcSender { + self.canvas_state.get_ipc_renderer().clone() + } } pub(crate) trait LayoutCanvasRenderingContext2DHelpers { @@ -153,11 +150,7 @@ impl CanvasContext for CanvasRenderingContext2D { } fn canvas(&self) -> HTMLCanvasElementOrOffscreenCanvas { - if let Some(ref canvas) = self.canvas { - HTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(canvas.as_rooted()) - } else { - unimplemented!() - } + self.canvas.clone() } fn resize(&self) { @@ -181,14 +174,7 @@ impl CanvasContext for CanvasRenderingContext2D { } fn mark_as_dirty(&self) { - self.canvas_state.mark_as_dirty(self.canvas.as_deref()) - } - - fn size(&self) -> Size2D { - self.canvas - .as_ref() - .map(|c| c.get_size().cast()) - .unwrap_or(Size2D::zero()) + self.canvas_state.mark_as_dirty(self.canvas.canvas()) } } @@ -204,9 +190,10 @@ impl CanvasContext for CanvasRenderingContext2D { impl CanvasRenderingContext2DMethods for CanvasRenderingContext2D { // https://html.spec.whatwg.org/multipage/#dom-context-2d-canvas fn Canvas(&self) -> DomRoot { - // This method is not called from a paint worklet rendering context, - // so it's OK to panic if self.canvas is None. - DomRoot::from_ref(self.canvas.as_ref().expect("No canvas.")) + match &self.canvas { + HTMLCanvasElementOrOffscreenCanvas::HTMLCanvasElement(canvas) => canvas.clone(), + _ => panic!("Should not be called from offscreen canvas"), + } } // https://html.spec.whatwg.org/multipage/#dom-context-2d-save @@ -334,14 +321,14 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo // https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option, can_gc: CanGc) { self.canvas_state - .fill_text(self.canvas.as_deref(), text, x, y, max_width, can_gc); + .fill_text(self.canvas.canvas(), text, x, y, max_width, can_gc); self.mark_as_dirty(); } // https://html.spec.whatwg.org/multipage/#textmetrics fn MeasureText(&self, text: DOMString, can_gc: CanGc) -> DomRoot { self.canvas_state - .measure_text(&self.global(), self.canvas.as_deref(), text, can_gc) + .measure_text(&self.global(), self.canvas.canvas(), text, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-font @@ -352,7 +339,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo // https://html.spec.whatwg.org/multipage/#dom-context-2d-font fn SetFont(&self, value: DOMString, can_gc: CanGc) { self.canvas_state - .set_font(self.canvas.as_deref(), value, can_gc) + .set_font(self.canvas.canvas(), value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-textalign @@ -388,7 +375,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult { self.canvas_state - .draw_image(self.canvas.as_deref(), image, dx, dy) + .draw_image(self.canvas.canvas(), image, dx, dy) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage @@ -401,7 +388,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo dh: f64, ) -> ErrorResult { self.canvas_state - .draw_image_(self.canvas.as_deref(), image, dx, dy, dw, dh) + .draw_image_(self.canvas.canvas(), image, dx, dy, dw, dh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage @@ -417,18 +404,8 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo dw: f64, dh: f64, ) -> ErrorResult { - self.canvas_state.draw_image__( - self.canvas.as_deref(), - image, - sx, - sy, - sw, - sh, - dx, - dy, - dw, - dh, - ) + self.canvas_state + .draw_image__(self.canvas.canvas(), image, sx, sy, sw, sh, dx, dy, dw, dh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto @@ -501,7 +478,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern, can_gc: CanGc) { self.canvas_state - .set_stroke_style(self.canvas.as_deref(), value, can_gc) + .set_stroke_style(self.canvas.canvas(), value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle @@ -512,7 +489,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern, can_gc: CanGc) { self.canvas_state - .set_fill_style(self.canvas.as_deref(), value, can_gc) + .set_fill_style(self.canvas.canvas(), value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata @@ -540,29 +517,14 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo sh: i32, can_gc: CanGc, ) -> Fallible> { - self.canvas_state.get_image_data( - self.canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size().to_u64()), - &self.global(), - sx, - sy, - sw, - sh, - can_gc, - ) + self.canvas_state + .get_image_data(self.canvas.size(), &self.global(), sx, sy, sw, sh, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata fn PutImageData(&self, imagedata: &ImageData, dx: i32, dy: i32) { - self.canvas_state.put_image_data( - self.canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size().to_u64()), - imagedata, - dx, - dy, - ) + self.canvas_state + .put_image_data(self.canvas.size(), imagedata, dx, dy) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata @@ -578,9 +540,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo dirty_height: i32, ) { self.canvas_state.put_image_data_( - self.canvas - .as_ref() - .map_or(Size2D::zero(), |c| c.get_size().to_u64()), + self.canvas.size(), imagedata, dx, dy, @@ -714,7 +674,7 @@ impl CanvasRenderingContext2DMethods for CanvasRenderingCo // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn SetShadowColor(&self, value: DOMString, can_gc: CanGc) { self.canvas_state - .set_shadow_color(self.canvas.as_deref(), value, can_gc) + .set_shadow_color(self.canvas.canvas(), value, can_gc) } } diff --git a/components/script/dom/offscreencanvas.rs b/components/script/dom/offscreencanvas.rs index ead9bd1b42e..7476d5edaca 100644 --- a/components/script/dom/offscreencanvas.rs +++ b/components/script/dom/offscreencanvas.rs @@ -123,12 +123,7 @@ impl OffscreenCanvas { OffscreenCanvasContext::OffscreenContext2d(ref ctx) => Some(DomRoot::from_ref(ctx)), }; } - let context = OffscreenCanvasRenderingContext2D::new( - &self.global(), - self, - self.placeholder.as_deref(), - CanGc::note(), - ); + let context = OffscreenCanvasRenderingContext2D::new(&self.global(), self, CanGc::note()); *self.context.borrow_mut() = Some(OffscreenCanvasContext::OffscreenContext2d( Dom::from_ref(&*context), )); @@ -138,6 +133,10 @@ impl OffscreenCanvas { pub(crate) fn is_valid(&self) -> bool { self.Width() != 0 && self.Height() != 0 } + + pub(crate) fn placeholder(&self) -> Option<&HTMLCanvasElement> { + self.placeholder.as_deref() + } } impl OffscreenCanvasMethods for OffscreenCanvas { diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs index 33937cbd12e..e5a9ef3cf7c 100644 --- a/components/script/dom/offscreencanvasrenderingcontext2d.rs +++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs @@ -2,12 +2,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ +use crate::dom::bindings::codegen::GenericBindings::CanvasRenderingContext2DBinding::CanvasRenderingContext2D_Binding::CanvasRenderingContext2DMethods; +use crate::canvas_context::CanvasContext as _; +use crate::dom::bindings::codegen::UnionTypes::HTMLCanvasElementOrOffscreenCanvas; use canvas_traits::canvas::{Canvas2dMsg, CanvasId, CanvasMsg}; use dom_struct::dom_struct; use euclid::default::Size2D; use ipc_channel::ipc::IpcSender; -use crate::canvas_state::CanvasState; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::{ CanvasDirection, CanvasFillRule, CanvasImageSource, CanvasLineCap, CanvasLineJoin, CanvasTextAlign, CanvasTextBaseline, @@ -16,71 +18,69 @@ use crate::dom::bindings::codegen::Bindings::OffscreenCanvasRenderingContext2DBi use crate::dom::bindings::codegen::UnionTypes::StringOrCanvasGradientOrCanvasPattern; use crate::dom::bindings::error::{ErrorResult, Fallible}; use crate::dom::bindings::num::Finite; -use crate::dom::bindings::reflector::{reflect_dom_object, DomGlobal, Reflector}; -use crate::dom::bindings::root::{Dom, DomRoot}; +use crate::dom::bindings::reflector::reflect_dom_object; +use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::canvasgradient::CanvasGradient; use crate::dom::canvaspattern::CanvasPattern; use crate::dom::dommatrix::DOMMatrix; use crate::dom::globalscope::GlobalScope; -use crate::dom::htmlcanvaselement::HTMLCanvasElement; use crate::dom::imagedata::ImageData; use crate::dom::offscreencanvas::OffscreenCanvas; use crate::dom::textmetrics::TextMetrics; use crate::script_runtime::CanGc; +use super::canvasrenderingcontext2d::CanvasRenderingContext2D; + #[dom_struct] pub(crate) struct OffscreenCanvasRenderingContext2D { - reflector_: Reflector, - canvas: Dom, - canvas_state: CanvasState, - htmlcanvas: Option>, + context: CanvasRenderingContext2D, } impl OffscreenCanvasRenderingContext2D { fn new_inherited( global: &GlobalScope, canvas: &OffscreenCanvas, - htmlcanvas: Option<&HTMLCanvasElement>, ) -> OffscreenCanvasRenderingContext2D { + let size = canvas.get_size().cast(); OffscreenCanvasRenderingContext2D { - reflector_: Reflector::new(), - canvas: Dom::from_ref(canvas), - htmlcanvas: htmlcanvas.map(Dom::from_ref), - canvas_state: CanvasState::new(global, canvas.get_size()), + context: CanvasRenderingContext2D::new_inherited( + global, + HTMLCanvasElementOrOffscreenCanvas::OffscreenCanvas(DomRoot::from_ref(canvas)), + size, + ), } } pub(crate) fn new( global: &GlobalScope, canvas: &OffscreenCanvas, - htmlcanvas: Option<&HTMLCanvasElement>, can_gc: CanGc, ) -> DomRoot { let boxed = Box::new(OffscreenCanvasRenderingContext2D::new_inherited( - global, canvas, htmlcanvas, + global, canvas, )); reflect_dom_object(boxed, global, can_gc) } pub(crate) fn set_canvas_bitmap_dimensions(&self, size: Size2D) { - self.canvas_state.set_bitmap_dimensions(size); + self.context.set_bitmap_dimensions(size.cast()); } pub(crate) fn send_canvas_2d_msg(&self, msg: Canvas2dMsg) { - self.canvas_state.send_canvas_2d_msg(msg) + self.context.send_canvas_2d_msg(msg) } pub(crate) fn origin_is_clean(&self) -> bool { - self.canvas_state.origin_is_clean() + self.context.origin_is_clean() } pub(crate) fn get_canvas_id(&self) -> CanvasId { - self.canvas_state.get_canvas_id() + self.context.get_canvas_id() } pub(crate) fn get_ipc_renderer(&self) -> IpcSender { - self.canvas_state.get_ipc_renderer().clone() + self.context.get_ipc_renderer() } } @@ -89,85 +89,85 @@ impl OffscreenCanvasRenderingContext2DMethods { // https://html.spec.whatwg.org/multipage/offscreencontext2d-canvas fn Canvas(&self) -> DomRoot { - DomRoot::from_ref(&self.canvas) + match self.context.canvas() { + HTMLCanvasElementOrOffscreenCanvas::OffscreenCanvas(canvas) => canvas, + _ => panic!("Should not be called from onscreen canvas"), + } } // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.fill_rect(x, y, width, height); + self.context.FillRect(x, y, width, height); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.clear_rect(x, y, width, height); + self.context.ClearRect(x, y, width, height); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.stroke_rect(x, y, width, height); + self.context.StrokeRect(x, y, width, height); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx fn ShadowOffsetX(&self) -> f64 { - self.canvas_state.shadow_offset_x() + self.context.ShadowOffsetX() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx fn SetShadowOffsetX(&self, value: f64) { - self.canvas_state.set_shadow_offset_x(value) + self.context.SetShadowOffsetX(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety fn ShadowOffsetY(&self) -> f64 { - self.canvas_state.shadow_offset_y() + self.context.ShadowOffsetY() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety fn SetShadowOffsetY(&self, value: f64) { - self.canvas_state.set_shadow_offset_y(value) + self.context.SetShadowOffsetY(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur fn ShadowBlur(&self) -> f64 { - self.canvas_state.shadow_blur() + self.context.ShadowBlur() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur fn SetShadowBlur(&self, value: f64) { - self.canvas_state.set_shadow_blur(value) + self.context.SetShadowBlur(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn ShadowColor(&self) -> DOMString { - self.canvas_state.shadow_color() + self.context.ShadowColor() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn SetShadowColor(&self, value: DOMString, can_gc: CanGc) { - self.canvas_state - .set_shadow_color(self.htmlcanvas.as_deref(), value, can_gc) + self.context.SetShadowColor(value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn StrokeStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { - self.canvas_state.stroke_style() + self.context.StrokeStyle() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern, can_gc: CanGc) { - self.canvas_state - .set_stroke_style(self.htmlcanvas.as_deref(), value, can_gc) + self.context.SetStrokeStyle(value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn FillStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { - self.canvas_state.fill_style() + self.context.FillStyle() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern, can_gc: CanGc) { - self.canvas_state - .set_fill_style(self.htmlcanvas.as_deref(), value, can_gc) + self.context.SetFillStyle(value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createlineargradient @@ -178,8 +178,7 @@ impl OffscreenCanvasRenderingContext2DMethods x1: Finite, y1: Finite, ) -> DomRoot { - self.canvas_state - .create_linear_gradient(&self.global(), x0, y0, x1, y1, CanGc::note()) + self.context.CreateLinearGradient(x0, y0, x1, y1) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createradialgradient @@ -192,16 +191,7 @@ impl OffscreenCanvasRenderingContext2DMethods y1: Finite, r1: Finite, ) -> Fallible> { - self.canvas_state.create_radial_gradient( - &self.global(), - x0, - y0, - r0, - x1, - y1, - r1, - CanGc::note(), - ) + self.context.CreateRadialGradient(x0, y0, r0, x1, y1, r1) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern @@ -210,153 +200,148 @@ impl OffscreenCanvasRenderingContext2DMethods image: CanvasImageSource, repetition: DOMString, ) -> Fallible>> { - self.canvas_state - .create_pattern(&self.global(), image, repetition, CanGc::note()) + self.context.CreatePattern(image, repetition) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-save fn Save(&self) { - self.canvas_state.save() + self.context.Save() } #[cfg_attr(crown, allow(crown::unrooted_must_root))] // https://html.spec.whatwg.org/multipage/#dom-context-2d-restore fn Restore(&self) { - self.canvas_state.restore() + self.context.Restore() } /// fn Reset(&self) { - self.canvas_state.reset() + self.context.Reset() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha fn GlobalAlpha(&self) -> f64 { - self.canvas_state.global_alpha() + self.context.GlobalAlpha() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha fn SetGlobalAlpha(&self, alpha: f64) { - self.canvas_state.set_global_alpha(alpha) + self.context.SetGlobalAlpha(alpha) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation fn GlobalCompositeOperation(&self) -> DOMString { - self.canvas_state.global_composite_operation() + self.context.GlobalCompositeOperation() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation fn SetGlobalCompositeOperation(&self, op_str: DOMString) { - self.canvas_state.set_global_composite_operation(op_str) + self.context.SetGlobalCompositeOperation(op_str) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled fn ImageSmoothingEnabled(&self) -> bool { - self.canvas_state.image_smoothing_enabled() + self.context.ImageSmoothingEnabled() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled fn SetImageSmoothingEnabled(&self, value: bool) { - self.canvas_state.set_image_smoothing_enabled(value) + self.context.SetImageSmoothingEnabled(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-filltext fn FillText(&self, text: DOMString, x: f64, y: f64, max_width: Option, can_gc: CanGc) { - self.canvas_state - .fill_text(self.htmlcanvas.as_deref(), text, x, y, max_width, can_gc) + self.context.FillText(text, x, y, max_width, can_gc) } // https://html.spec.whatwg.org/multipage/#textmetrics fn MeasureText(&self, text: DOMString, can_gc: CanGc) -> DomRoot { - self.canvas_state - .measure_text(&self.global(), self.htmlcanvas.as_deref(), text, can_gc) + self.context.MeasureText(text, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-font fn Font(&self) -> DOMString { - self.canvas_state.font() + self.context.Font() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-font fn SetFont(&self, value: DOMString, can_gc: CanGc) { - self.canvas_state - .set_font(self.htmlcanvas.as_deref(), value, can_gc) + self.context.SetFont(value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-textalign fn TextAlign(&self) -> CanvasTextAlign { - self.canvas_state.text_align() + self.context.TextAlign() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-textalign fn SetTextAlign(&self, value: CanvasTextAlign) { - self.canvas_state.set_text_align(value) + self.context.SetTextAlign(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-textbaseline fn TextBaseline(&self) -> CanvasTextBaseline { - self.canvas_state.text_baseline() + self.context.TextBaseline() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-textbaseline fn SetTextBaseline(&self, value: CanvasTextBaseline) { - self.canvas_state.set_text_baseline(value) + self.context.SetTextBaseline(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-direction fn Direction(&self) -> CanvasDirection { - self.canvas_state.direction() + self.context.Direction() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-direction fn SetDirection(&self, value: CanvasDirection) { - self.canvas_state.set_direction(value) + self.context.SetDirection(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth fn LineWidth(&self) -> f64 { - self.canvas_state.line_width() + self.context.LineWidth() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth fn SetLineWidth(&self, width: f64) { - self.canvas_state.set_line_width(width) + self.context.SetLineWidth(width) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap fn LineCap(&self) -> CanvasLineCap { - self.canvas_state.line_cap() + self.context.LineCap() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap fn SetLineCap(&self, cap: CanvasLineCap) { - self.canvas_state.set_line_cap(cap) + self.context.SetLineCap(cap) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin fn LineJoin(&self) -> CanvasLineJoin { - self.canvas_state.line_join() + self.context.LineJoin() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin fn SetLineJoin(&self, join: CanvasLineJoin) { - self.canvas_state.set_line_join(join) + self.context.SetLineJoin(join) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit fn MiterLimit(&self) -> f64 { - self.canvas_state.miter_limit() + self.context.MiterLimit() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit fn SetMiterLimit(&self, limit: f64) { - self.canvas_state.set_miter_limit(limit) + self.context.SetMiterLimit(limit) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata fn CreateImageData(&self, sw: i32, sh: i32, can_gc: CanGc) -> Fallible> { - self.canvas_state - .create_image_data(&self.global(), sw, sh, can_gc) + self.context.CreateImageData(sw, sh, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createimagedata @@ -365,8 +350,7 @@ impl OffscreenCanvasRenderingContext2DMethods imagedata: &ImageData, can_gc: CanGc, ) -> Fallible> { - self.canvas_state - .create_image_data_(&self.global(), imagedata, can_gc) + self.context.CreateImageData_(imagedata, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-getimagedata @@ -378,21 +362,12 @@ impl OffscreenCanvasRenderingContext2DMethods sh: i32, can_gc: CanGc, ) -> Fallible> { - self.canvas_state.get_image_data( - self.canvas.get_size(), - &self.global(), - sx, - sy, - sw, - sh, - can_gc, - ) + self.context.GetImageData(sx, sy, sw, sh, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata fn PutImageData(&self, imagedata: &ImageData, dx: i32, dy: i32) { - self.canvas_state - .put_image_data(self.canvas.get_size(), imagedata, dx, dy) + self.context.PutImageData(imagedata, dx, dy) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-putimagedata @@ -407,8 +382,7 @@ impl OffscreenCanvasRenderingContext2DMethods dirty_width: i32, dirty_height: i32, ) { - self.canvas_state.put_image_data_( - self.canvas.get_size(), + self.context.PutImageData_( imagedata, dx, dy, @@ -421,8 +395,7 @@ impl OffscreenCanvasRenderingContext2DMethods // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult { - self.canvas_state - .draw_image(self.htmlcanvas.as_deref(), image, dx, dy) + self.context.DrawImage(image, dx, dy) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage @@ -434,8 +407,7 @@ impl OffscreenCanvasRenderingContext2DMethods dw: f64, dh: f64, ) -> ErrorResult { - self.canvas_state - .draw_image_(self.htmlcanvas.as_deref(), image, dx, dy, dw, dh) + self.context.DrawImage_(image, dx, dy, dw, dh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage @@ -451,120 +423,108 @@ impl OffscreenCanvasRenderingContext2DMethods dw: f64, dh: f64, ) -> ErrorResult { - self.canvas_state.draw_image__( - self.htmlcanvas.as_deref(), - image, - sx, - sy, - sw, - sh, - dx, - dy, - dw, - dh, - ) + self.context + .DrawImage__(image, sx, sy, sw, sh, dx, dy, dw, dh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath fn BeginPath(&self) { - self.canvas_state.begin_path() + self.context.BeginPath() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill fn Fill(&self, fill_rule: CanvasFillRule) { - self.canvas_state.fill(fill_rule) + self.context.Fill(fill_rule) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke fn Stroke(&self) { - self.canvas_state.stroke() + self.context.Stroke() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip fn Clip(&self, fill_rule: CanvasFillRule) { - self.canvas_state.clip(fill_rule) + self.context.Clip(fill_rule) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-ispointinpath fn IsPointInPath(&self, x: f64, y: f64, fill_rule: CanvasFillRule) -> bool { - self.canvas_state - .is_point_in_path(&self.global(), x, y, fill_rule) + self.context.IsPointInPath(x, y, fill_rule) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale fn Scale(&self, x: f64, y: f64) { - self.canvas_state.scale(x, y) + self.context.Scale(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate fn Rotate(&self, angle: f64) { - self.canvas_state.rotate(angle) + self.context.Rotate(angle) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate fn Translate(&self, x: f64, y: f64) { - self.canvas_state.translate(x, y) + self.context.Translate(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { - self.canvas_state.transform(a, b, c, d, e, f) + self.context.Transform(a, b, c, d, e, f) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-gettransform fn GetTransform(&self, can_gc: CanGc) -> DomRoot { - self.canvas_state.get_transform(&self.global(), can_gc) + self.context.GetTransform(can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { - self.canvas_state.set_transform(a, b, c, d, e, f) + self.context.SetTransform(a, b, c, d, e, f) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform fn ResetTransform(&self) { - self.canvas_state.reset_transform() + self.context.ResetTransform() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath fn ClosePath(&self) { - self.canvas_state.close_path() + self.context.ClosePath() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto fn MoveTo(&self, x: f64, y: f64) { - self.canvas_state.move_to(x, y) + self.context.MoveTo(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-lineto fn LineTo(&self, x: f64, y: f64) { - self.canvas_state.line_to(x, y) + self.context.LineTo(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rect fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { - self.canvas_state.rect(x, y, width, height) + self.context.Rect(x, y, width, height) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { - self.canvas_state.quadratic_curve_to(cpx, cpy, x, y) + self.context.QuadraticCurveTo(cpx, cpy, x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beziercurveto fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { - self.canvas_state - .bezier_curve_to(cp1x, cp1y, cp2x, cp2y, x, y) + self.context.BezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arc fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> ErrorResult { - self.canvas_state.arc(x, y, r, start, end, ccw) + self.context.Arc(x, y, r, start, end, ccw) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arcto fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> ErrorResult { - self.canvas_state.arc_to(cp1x, cp1y, cp2x, cp2y, r) + self.context.ArcTo(cp1x, cp1y, cp2x, cp2y, r) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-ellipse @@ -579,7 +539,7 @@ impl OffscreenCanvasRenderingContext2DMethods end: f64, ccw: bool, ) -> ErrorResult { - self.canvas_state - .ellipse(x, y, rx, ry, rotation, start, end, ccw) + self.context + .Ellipse(x, y, rx, ry, rotation, start, end, ccw) } } diff --git a/components/script/dom/paintrenderingcontext2d.rs b/components/script/dom/paintrenderingcontext2d.rs index 618d782dc1f..b65eee99e63 100644 --- a/components/script/dom/paintrenderingcontext2d.rs +++ b/components/script/dom/paintrenderingcontext2d.rs @@ -4,17 +4,19 @@ use std::cell::Cell; -use canvas_traits::canvas::CanvasImageData; +use canvas_traits::canvas::{CanvasId, CanvasImageData, CanvasMsg, FromLayoutMsg}; use dom_struct::dom_struct; use euclid::{Scale, Size2D}; use ipc_channel::ipc::IpcSender; +use script_bindings::reflector::Reflector; use servo_url::ServoUrl; use style_traits::CSSPixel; use webrender_api::units::DevicePixel; +use super::bindings::reflector::DomGlobal as _; +use crate::canvas_state::CanvasState; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::{ CanvasFillRule, CanvasImageSource, CanvasLineCap, CanvasLineJoin, - CanvasRenderingContext2DMethods, }; use crate::dom::bindings::codegen::Bindings::PaintRenderingContext2DBinding::PaintRenderingContext2DMethods; use crate::dom::bindings::codegen::UnionTypes::StringOrCanvasGradientOrCanvasPattern; @@ -26,23 +28,23 @@ use crate::dom::bindings::root::DomRoot; use crate::dom::bindings::str::DOMString; use crate::dom::canvasgradient::CanvasGradient; use crate::dom::canvaspattern::CanvasPattern; -use crate::dom::canvasrenderingcontext2d::CanvasRenderingContext2D; use crate::dom::dommatrix::DOMMatrix; use crate::dom::paintworkletglobalscope::PaintWorkletGlobalScope; use crate::script_runtime::CanGc; #[dom_struct] pub(crate) struct PaintRenderingContext2D { - context: CanvasRenderingContext2D, + reflector_: Reflector, + canvas_state: CanvasState, #[no_trace] device_pixel_ratio: Cell>, } impl PaintRenderingContext2D { fn new_inherited(global: &PaintWorkletGlobalScope) -> PaintRenderingContext2D { - let size = Size2D::zero(); PaintRenderingContext2D { - context: CanvasRenderingContext2D::new_inherited(global.upcast(), None, size), + reflector_: Reflector::new(), + canvas_state: CanvasState::new(global.upcast(), Size2D::zero()), device_pixel_ratio: Cell::new(Scale::new(1.0)), } } @@ -58,12 +60,17 @@ impl PaintRenderingContext2D { ) } + pub(crate) fn get_canvas_id(&self) -> CanvasId { + self.canvas_state.get_canvas_id() + } + pub(crate) fn send_data(&self, sender: IpcSender) { - self.context.send_data(sender); + let msg = CanvasMsg::FromLayout(FromLayoutMsg::SendData(sender), self.get_canvas_id()); + let _ = self.canvas_state.get_ipc_renderer().send(msg); } pub(crate) fn take_missing_image_urls(&self) -> Vec { - self.context.take_missing_image_urls() + std::mem::take(&mut self.canvas_state.get_missing_image_urls().borrow_mut()) } pub(crate) fn set_bitmap_dimensions( @@ -73,8 +80,8 @@ impl PaintRenderingContext2D { ) { let size = size * device_pixel_ratio; self.device_pixel_ratio.set(device_pixel_ratio); - self.context - .set_canvas_bitmap_dimensions(size.to_untyped().to_u64()); + self.canvas_state + .set_bitmap_dimensions(size.to_untyped().to_u64()); self.scale_by_device_pixel_ratio(); } @@ -89,124 +96,125 @@ impl PaintRenderingContext2D { impl PaintRenderingContext2DMethods for PaintRenderingContext2D { // https://html.spec.whatwg.org/multipage/#dom-context-2d-save fn Save(&self) { - self.context.Save() + self.canvas_state.save() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-restore fn Restore(&self) { - self.context.Restore() + self.canvas_state.restore() } /// fn Reset(&self) { - self.context.Reset() + self.canvas_state.reset() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-scale fn Scale(&self, x: f64, y: f64) { - self.context.Scale(x, y) + self.canvas_state.scale(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rotate fn Rotate(&self, angle: f64) { - self.context.Rotate(angle) + self.canvas_state.rotate(angle) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-translate fn Translate(&self, x: f64, y: f64) { - self.context.Translate(x, y) + self.canvas_state.translate(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-transform fn Transform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { - self.context.Transform(a, b, c, d, e, f) + self.canvas_state.transform(a, b, c, d, e, f) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-gettransform fn GetTransform(&self, can_gc: CanGc) -> DomRoot { - self.context.GetTransform(can_gc) + self.canvas_state.get_transform(&self.global(), can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-settransform fn SetTransform(&self, a: f64, b: f64, c: f64, d: f64, e: f64, f: f64) { - self.context.SetTransform(a, b, c, d, e, f); + self.canvas_state.set_transform(a, b, c, d, e, f); self.scale_by_device_pixel_ratio(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-resettransform fn ResetTransform(&self) { - self.context.ResetTransform(); + self.canvas_state.reset_transform(); self.scale_by_device_pixel_ratio(); } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha fn GlobalAlpha(&self) -> f64 { - self.context.GlobalAlpha() + self.canvas_state.global_alpha() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalalpha fn SetGlobalAlpha(&self, alpha: f64) { - self.context.SetGlobalAlpha(alpha) + self.canvas_state.set_global_alpha(alpha) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation fn GlobalCompositeOperation(&self) -> DOMString { - self.context.GlobalCompositeOperation() + self.canvas_state.global_composite_operation() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-globalcompositeoperation fn SetGlobalCompositeOperation(&self, op_str: DOMString) { - self.context.SetGlobalCompositeOperation(op_str) + self.canvas_state.set_global_composite_operation(op_str) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-fillrect fn FillRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.context.FillRect(x, y, width, height) + self.canvas_state.fill_rect(x, y, width, height) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-clearrect fn ClearRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.context.ClearRect(x, y, width, height) + self.canvas_state.clear_rect(x, y, width, height) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokerect fn StrokeRect(&self, x: f64, y: f64, width: f64, height: f64) { - self.context.StrokeRect(x, y, width, height) + self.canvas_state.stroke_rect(x, y, width, height) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beginpath fn BeginPath(&self) { - self.context.BeginPath() + self.canvas_state.begin_path() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-closepath fn ClosePath(&self) { - self.context.ClosePath() + self.canvas_state.close_path() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-fill fn Fill(&self, fill_rule: CanvasFillRule) { - self.context.Fill(fill_rule) + self.canvas_state.fill(fill_rule) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-stroke fn Stroke(&self) { - self.context.Stroke() + self.canvas_state.stroke() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-clip fn Clip(&self, fill_rule: CanvasFillRule) { - self.context.Clip(fill_rule) + self.canvas_state.clip(fill_rule) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-ispointinpath fn IsPointInPath(&self, x: f64, y: f64, fill_rule: CanvasFillRule) -> bool { - self.context.IsPointInPath(x, y, fill_rule) + self.canvas_state + .is_point_in_path(&self.global(), x, y, fill_rule) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage fn DrawImage(&self, image: CanvasImageSource, dx: f64, dy: f64) -> ErrorResult { - self.context.DrawImage(image, dx, dy) + self.canvas_state.draw_image(None, image, dx, dy) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage @@ -218,7 +226,7 @@ impl PaintRenderingContext2DMethods for PaintRenderingCont dw: f64, dh: f64, ) -> ErrorResult { - self.context.DrawImage_(image, dx, dy, dw, dh) + self.canvas_state.draw_image_(None, image, dx, dy, dw, dh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-drawimage @@ -234,43 +242,44 @@ impl PaintRenderingContext2DMethods for PaintRenderingCont dw: f64, dh: f64, ) -> ErrorResult { - self.context - .DrawImage__(image, sx, sy, sw, sh, dx, dy, dw, dh) + self.canvas_state + .draw_image__(None, image, sx, sy, sw, sh, dx, dy, dw, dh) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-moveto fn MoveTo(&self, x: f64, y: f64) { - self.context.MoveTo(x, y) + self.canvas_state.move_to(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-lineto fn LineTo(&self, x: f64, y: f64) { - self.context.LineTo(x, y) + self.canvas_state.line_to(x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-rect fn Rect(&self, x: f64, y: f64, width: f64, height: f64) { - self.context.Rect(x, y, width, height) + self.canvas_state.rect(x, y, width, height) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-quadraticcurveto fn QuadraticCurveTo(&self, cpx: f64, cpy: f64, x: f64, y: f64) { - self.context.QuadraticCurveTo(cpx, cpy, x, y) + self.canvas_state.quadratic_curve_to(cpx, cpy, x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-beziercurveto fn BezierCurveTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, x: f64, y: f64) { - self.context.BezierCurveTo(cp1x, cp1y, cp2x, cp2y, x, y) + self.canvas_state + .bezier_curve_to(cp1x, cp1y, cp2x, cp2y, x, y) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arc fn Arc(&self, x: f64, y: f64, r: f64, start: f64, end: f64, ccw: bool) -> ErrorResult { - self.context.Arc(x, y, r, start, end, ccw) + self.canvas_state.arc(x, y, r, start, end, ccw) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-arcto fn ArcTo(&self, cp1x: f64, cp1y: f64, cp2x: f64, cp2y: f64, r: f64) -> ErrorResult { - self.context.ArcTo(cp1x, cp1y, cp2x, cp2y, r) + self.canvas_state.arc_to(cp1x, cp1y, cp2x, cp2y, r) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-ellipse @@ -285,38 +294,38 @@ impl PaintRenderingContext2DMethods for PaintRenderingCont end: f64, ccw: bool, ) -> ErrorResult { - self.context - .Ellipse(x, y, rx, ry, rotation, start, end, ccw) + self.canvas_state + .ellipse(x, y, rx, ry, rotation, start, end, ccw) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled fn ImageSmoothingEnabled(&self) -> bool { - self.context.ImageSmoothingEnabled() + self.canvas_state.image_smoothing_enabled() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-imagesmoothingenabled fn SetImageSmoothingEnabled(&self, value: bool) { - self.context.SetImageSmoothingEnabled(value) + self.canvas_state.set_image_smoothing_enabled(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn StrokeStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { - self.context.StrokeStyle() + self.canvas_state.stroke_style() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetStrokeStyle(&self, value: StringOrCanvasGradientOrCanvasPattern, can_gc: CanGc) { - self.context.SetStrokeStyle(value, can_gc) + self.canvas_state.set_stroke_style(None, value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn FillStyle(&self) -> StringOrCanvasGradientOrCanvasPattern { - self.context.FillStyle() + self.canvas_state.fill_style() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-strokestyle fn SetFillStyle(&self, value: StringOrCanvasGradientOrCanvasPattern, can_gc: CanGc) { - self.context.SetFillStyle(value, can_gc) + self.canvas_state.set_fill_style(None, value, can_gc) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createlineargradient @@ -327,7 +336,8 @@ impl PaintRenderingContext2DMethods for PaintRenderingCont x1: Finite, y1: Finite, ) -> DomRoot { - self.context.CreateLinearGradient(x0, y0, x1, y1) + self.canvas_state + .create_linear_gradient(&self.global(), x0, y0, x1, y1, CanGc::note()) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createradialgradient @@ -340,7 +350,16 @@ impl PaintRenderingContext2DMethods for PaintRenderingCont y1: Finite, r1: Finite, ) -> Fallible> { - self.context.CreateRadialGradient(x0, y0, r0, x1, y1, r1) + self.canvas_state.create_radial_gradient( + &self.global(), + x0, + y0, + r0, + x1, + y1, + r1, + CanGc::note(), + ) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-createpattern @@ -349,86 +368,87 @@ impl PaintRenderingContext2DMethods for PaintRenderingCont image: CanvasImageSource, repetition: DOMString, ) -> Fallible>> { - self.context.CreatePattern(image, repetition) + self.canvas_state + .create_pattern(&self.global(), image, repetition, CanGc::note()) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth fn LineWidth(&self) -> f64 { - self.context.LineWidth() + self.canvas_state.line_width() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linewidth fn SetLineWidth(&self, width: f64) { - self.context.SetLineWidth(width) + self.canvas_state.set_line_width(width) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap fn LineCap(&self) -> CanvasLineCap { - self.context.LineCap() + self.canvas_state.line_cap() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linecap fn SetLineCap(&self, cap: CanvasLineCap) { - self.context.SetLineCap(cap) + self.canvas_state.set_line_cap(cap) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin fn LineJoin(&self) -> CanvasLineJoin { - self.context.LineJoin() + self.canvas_state.line_join() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-linejoin fn SetLineJoin(&self, join: CanvasLineJoin) { - self.context.SetLineJoin(join) + self.canvas_state.set_line_join(join) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit fn MiterLimit(&self) -> f64 { - self.context.MiterLimit() + self.canvas_state.miter_limit() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-miterlimit fn SetMiterLimit(&self, limit: f64) { - self.context.SetMiterLimit(limit) + self.canvas_state.set_miter_limit(limit) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx fn ShadowOffsetX(&self) -> f64 { - self.context.ShadowOffsetX() + self.canvas_state.shadow_offset_x() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsetx fn SetShadowOffsetX(&self, value: f64) { - self.context.SetShadowOffsetX(value) + self.canvas_state.set_shadow_offset_x(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety fn ShadowOffsetY(&self) -> f64 { - self.context.ShadowOffsetY() + self.canvas_state.shadow_offset_y() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowoffsety fn SetShadowOffsetY(&self, value: f64) { - self.context.SetShadowOffsetY(value) + self.canvas_state.set_shadow_offset_y(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur fn ShadowBlur(&self) -> f64 { - self.context.ShadowBlur() + self.canvas_state.shadow_blur() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowblur fn SetShadowBlur(&self, value: f64) { - self.context.SetShadowBlur(value) + self.canvas_state.set_shadow_blur(value) } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn ShadowColor(&self) -> DOMString { - self.context.ShadowColor() + self.canvas_state.shadow_color() } // https://html.spec.whatwg.org/multipage/#dom-context-2d-shadowcolor fn SetShadowColor(&self, value: DOMString, can_gc: CanGc) { - self.context.SetShadowColor(value, can_gc) + self.canvas_state.set_shadow_color(None, value, can_gc) } } diff --git a/components/script_bindings/codegen/CodegenRust.py b/components/script_bindings/codegen/CodegenRust.py index 06f993d8b5d..170ad5c20cc 100644 --- a/components/script_bindings/codegen/CodegenRust.py +++ b/components/script_bindings/codegen/CodegenRust.py @@ -2462,8 +2462,8 @@ class CGAssertInheritance(CGThing): selfName = self.descriptor.interface.identifier.name - if selfName == "PaintRenderingContext2D": - # PaintRenderingContext2D embeds a CanvasRenderingContext2D + if selfName == "OffscreenCanvasRenderingContext2D": + # OffscreenCanvasRenderingContext2D embeds a CanvasRenderingContext2D # instead of a Reflector as an optimization, # but this is fine since CanvasRenderingContext2D # also has a reflector