diff options
-rw-r--r-- | components/script/canvas_state.rs | 8 | ||||
-rw-r--r-- | components/script/dom/canvasrenderingcontext2d.rs | 12 | ||||
-rw-r--r-- | components/script/dom/offscreencanvasrenderingcontext2d.rs | 1 |
3 files changed, 2 insertions, 19 deletions
diff --git a/components/script/canvas_state.rs b/components/script/canvas_state.rs index bb87727543a..d0dca9b2d15 100644 --- a/components/script/canvas_state.rs +++ b/components/script/canvas_state.rs @@ -175,14 +175,6 @@ impl CanvasState { &self.missing_image_urls } - pub fn get_state(&self) -> &DomRefCell<CanvasContextState> { - &self.state - } - - pub fn get_saved_state(&self) -> &DomRefCell<Vec<CanvasContextState>> { - &self.saved_states - } - pub fn get_canvas_id(&self) -> CanvasId { self.canvas_id.clone() } diff --git a/components/script/dom/canvasrenderingcontext2d.rs b/components/script/dom/canvasrenderingcontext2d.rs index 2270fdeb65a..4820a3bbfd7 100644 --- a/components/script/dom/canvasrenderingcontext2d.rs +++ b/components/script/dom/canvasrenderingcontext2d.rs @@ -2,8 +2,7 @@ * 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::canvas_state::{CanvasContextState, CanvasState}; -use crate::dom::bindings::cell::DomRefCell; +use crate::canvas_state::CanvasState; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasFillRule; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasImageSource; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineCap; @@ -80,17 +79,10 @@ impl CanvasRenderingContext2D { .unwrap(); } - // TODO: This duplicates functionality in canvas state // https://html.spec.whatwg.org/multipage/#reset-the-rendering-context-to-its-default-state fn reset_to_initial_state(&self) { - self.canvas_state.get_saved_state().borrow_mut().clear(); - *self.canvas_state.get_state().borrow_mut() = CanvasContextState::new(); + self.canvas_state.reset_to_initial_state(); } - /* - pub fn get_canvas_state(&self) -> Ref<CanvasState> { - self.canvas_state.borrow() - } - */ pub fn set_canvas_bitmap_dimensions(&self, size: Size2D<u64>) { self.canvas_state.set_bitmap_dimensions(size); diff --git a/components/script/dom/offscreencanvasrenderingcontext2d.rs b/components/script/dom/offscreencanvasrenderingcontext2d.rs index 130c1782399..a3a873250f1 100644 --- a/components/script/dom/offscreencanvasrenderingcontext2d.rs +++ b/components/script/dom/offscreencanvasrenderingcontext2d.rs @@ -3,7 +3,6 @@ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */ use crate::canvas_state::CanvasState; -use crate::dom::bindings::cell::DomRefCell; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasFillRule; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasImageSource; use crate::dom::bindings::codegen::Bindings::CanvasRenderingContext2DBinding::CanvasLineCap; |