Merge pull request rust-skia#816 from pragmatrix/canvas-shared

Refactor Canvas so that all functions can be used on shared references

Author: pragmatrix

skia-org/src/artifact.rs

@@ -5,7 +5,7 @@ pub fn draw_image_on_surface(
     surface: &mut Surface,
     path: &Path,
     name: &str,
-    func: impl Fn(&mut Canvas),
+    func: impl Fn(&Canvas),
 ) {
     let canvas = surface.canvas();
 

skia-org/src/drivers.rs

@@ -35,9 +35,9 @@ pub trait DrawingDriver {
 
     fn new() -> Self;
 
-    fn draw_image(&mut self, size: (i32, i32), path: &Path, name: &str, func: impl Fn(&mut Canvas));
+    fn draw_image(&mut self, size: (i32, i32), path: &Path, name: &str, func: impl Fn(&Canvas));
 
-    fn draw_image_256(&mut self, path: &Path, name: &str, func: impl Fn(&mut Canvas)) {
+    fn draw_image_256(&mut self, path: &Path, name: &str, func: impl Fn(&Canvas)) {
         self.draw_image((256, 256), path, name, func)
     }
 }

skia-org/src/drivers/cpu.rs

@@ -18,7 +18,7 @@ impl DrawingDriver for Cpu {
         (width, height): (i32, i32),
         path: &Path,
         name: &str,
-        func: impl Fn(&mut Canvas),
+        func: impl Fn(&Canvas),
     ) {
         let mut surface = surfaces::raster_n32_premul((width * 2, height * 2)).unwrap();
         artifact::draw_image_on_surface(&mut surface, path, name, func);

skia-org/src/drivers/d3d.rs

@@ -71,7 +71,7 @@ impl DrawingDriver for D3D {
         (width, height): (i32, i32),
         path: &Path,
         name: &str,
-        func: impl Fn(&mut Canvas),
+        func: impl Fn(&Canvas),
     ) {
         let image_info = ImageInfo::new_n32_premul((width * 2, height * 2), None);
         let mut surface = gpu::surfaces::render_target(
@@ -88,7 +88,7 @@ impl DrawingDriver for D3D {
         artifact::draw_image_on_surface(&mut surface, path, name, func);
     }
 
-    fn draw_image_256(&mut self, path: &Path, name: &str, func: impl Fn(&mut Canvas)) {
+    fn draw_image_256(&mut self, path: &Path, name: &str, func: impl Fn(&Canvas)) {
         self.draw_image((256, 256), path, name, func)
     }
 }

skia-org/src/drivers/gl.rs

@@ -22,7 +22,7 @@ impl DrawingDriver for OpenGl {
         (width, height): (i32, i32),
         path: &Path,
         name: &str,
-        func: impl Fn(&mut Canvas),
+        func: impl Fn(&Canvas),
     ) {
         let image_info = ImageInfo::new_n32_premul((width * 2, height * 2), None);
         let mut surface = gpu::surfaces::render_target(

skia-org/src/drivers/metal.rs

@@ -51,7 +51,7 @@ impl DrawingDriver for Metal {
         (width, height): (i32, i32),
         path: &Path,
         name: &str,
-        func: impl Fn(&mut Canvas),
+        func: impl Fn(&Canvas),
     ) {
         let _image_pool = AutoreleasePool::new();
 

skia-org/src/drivers/pdf.rs

@@ -11,13 +11,7 @@ impl DrawingDriver for Pdf {
         Self
     }
 
-    fn draw_image(
-        &mut self,
-        size: (i32, i32),
-        path: &Path,
-        name: &str,
-        func: impl Fn(&mut Canvas),
-    ) {
+    fn draw_image(&mut self, size: (i32, i32), path: &Path, name: &str, func: impl Fn(&Canvas)) {
         let mut document = skia_safe::pdf::new_document(None).begin_page(size, None);
         func(document.canvas());
         let data = document.end_page().close();

skia-org/src/drivers/render_svg.rs

@@ -18,10 +18,10 @@ impl DrawingDriver for RenderSvg {
         size @ (width, height): (i32, i32),
         path: &Path,
         name: &str,
-        draw: impl Fn(&mut Canvas),
+        draw: impl Fn(&Canvas),
     ) {
-        let mut canvas = svg::Canvas::new(Rect::from_size(size), None);
-        draw(&mut canvas);
+        let canvas = svg::Canvas::new(Rect::from_size(size), None);
+        draw(&canvas);
         let data = canvas.end();
         let svg = data.as_bytes();
 

skia-org/src/drivers/svg.rs

@@ -11,16 +11,10 @@ impl DrawingDriver for Svg {
         Self
     }
 
-    fn draw_image(
-        &mut self,
-        size: (i32, i32),
-        path: &Path,
-        name: &str,
-        func: impl Fn(&mut Canvas),
-    ) {
+    fn draw_image(&mut self, size: (i32, i32), path: &Path, name: &str, func: impl Fn(&Canvas)) {
         use skia_safe::Rect;
-        let mut canvas = skia_safe::svg::Canvas::new(Rect::from_size(size), None);
-        func(&mut canvas);
+        let canvas = skia_safe::svg::Canvas::new(Rect::from_size(size), None);
+        func(&canvas);
         let data = canvas.end();
         artifact::write_file(data.as_bytes(), path, name, "svg");
     }

skia-org/src/drivers/vulkan.rs

@@ -58,7 +58,7 @@ impl DrawingDriver for Vulkan {
         (width, height): (i32, i32),
         path: &Path,
         name: &str,
-        func: impl Fn(&mut Canvas),
+        func: impl Fn(&Canvas),
     ) {
         let image_info = ImageInfo::new_n32_premul((width * 2, height * 2), None);
         let mut surface = gpu::surfaces::render_target(

skia-org/src/skcanvas_overview.rs

@@ -11,7 +11,7 @@ pub fn draw(driver: &mut impl DrawingDriver, path: &path::Path) {
     driver.draw_image_256(&path, "hello-skia", draw_hello_skia);
 }
 
-fn draw_heptagram(canvas: &mut Canvas) {
+fn draw_heptagram(canvas: &Canvas) {
     const SCALE: scalar = 256.0;
     const R: scalar = 0.45 * SCALE;
     #[allow(clippy::excessive_precision)]
@@ -32,7 +32,7 @@ fn draw_heptagram(canvas: &mut Canvas) {
         .draw_path(&path, &p);
 }
 
-fn draw_rotated_rectangle(canvas: &mut Canvas) {
+fn draw_rotated_rectangle(canvas: &Canvas) {
     canvas.save();
     canvas.translate((128.0, 128.0)).rotate(45.0, None);
     let rect = Rect::from_point_and_size((-90.5, -90.5), (181.0, 181.0));
@@ -42,7 +42,7 @@ fn draw_rotated_rectangle(canvas: &mut Canvas) {
     canvas.restore();
 }
 
-fn draw_hello_skia(canvas: &mut Canvas) {
+fn draw_hello_skia(canvas: &Canvas) {
     let image = resources::color_wheel();
 
     canvas.draw_color(Color::WHITE, BlendMode::default());

skia-org/src/skpaint_overview.rs

@@ -50,7 +50,7 @@ pub fn draw(driver: &mut impl DrawingDriver, path: &path::Path) {
     driver.draw_image_256(path, "22-sum-path-effect", draw_sum_path_effect);
 }
 
-fn draw_three_paints(canvas: &mut Canvas) {
+fn draw_three_paints(canvas: &Canvas) {
     let (paint1, paint2, paint3) = (
         &mut Paint::default(),
         &mut Paint::default(),
@@ -90,7 +90,7 @@ fn draw_three_paints(canvas: &mut Canvas) {
         .draw_text_blob(&blob2, (20.0, 224.0), paint3);
 }
 
-fn draw_fill_and_stroke(canvas: &mut Canvas) {
+fn draw_fill_and_stroke(canvas: &Canvas) {
     let fill_paint = &mut Paint::default();
     let stroke_paint = &mut Paint::default();
     stroke_paint
@@ -113,7 +113,7 @@ fn draw_fill_and_stroke(canvas: &mut Canvas) {
     canvas.draw_text_blob(&blob, (20, 220), fill_paint);
 }
 
-fn draw_gradient(canvas: &mut Canvas) {
+fn draw_gradient(canvas: &Canvas) {
     let points: (Point, Point) = ((0.0, 0.0).into(), (256.0, 256.0).into());
     let colors = [Color::BLUE, Color::YELLOW];
     let paint = &mut Paint::default();
@@ -129,8 +129,8 @@ fn draw_gradient(canvas: &mut Canvas) {
     canvas.draw_paint(paint);
 }
 
-fn draw_transfer_modes(canvas: &mut Canvas) {
-    fn draw_str(c: &mut Canvas, text: &str, x: scalar, y: scalar, font: &Font, paint: &Paint) {
+fn draw_transfer_modes(canvas: &Canvas) {
+    fn draw_str(c: &Canvas, text: &str, x: scalar, y: scalar, font: &Font, paint: &Paint) {
         c.draw_text_blob(TextBlob::from_str(text, font).unwrap(), (x, y), paint);
     }
 
@@ -213,7 +213,7 @@ fn draw_transfer_modes(canvas: &mut Canvas) {
     }
 }
 
-fn draw_bitmap_shader(canvas: &mut Canvas) {
+fn draw_bitmap_shader(canvas: &Canvas) {
     let image = resources::color_wheel();
 
     canvas.clear(Color::WHITE);
@@ -228,7 +228,7 @@ fn draw_bitmap_shader(canvas: &mut Canvas) {
     canvas.draw_paint(paint);
 }
 
-fn draw_radial_gradient_shader(canvas: &mut Canvas) {
+fn draw_radial_gradient_shader(canvas: &Canvas) {
     let colors = [Color::BLUE, Color::YELLOW];
     let mut paint = Paint::default();
     paint.set_shader(gradient_shader::radial(
@@ -243,7 +243,7 @@ fn draw_radial_gradient_shader(canvas: &mut Canvas) {
     canvas.draw_paint(&paint);
 }
 
-fn draw_two_point_conical_shader(canvas: &mut Canvas) {
+fn draw_two_point_conical_shader(canvas: &Canvas) {
     let colors = [Color::BLUE, Color::YELLOW];
     let paint = &mut Paint::default();
     paint.set_shader(gradient_shader::two_point_conical(
@@ -260,7 +260,7 @@ fn draw_two_point_conical_shader(canvas: &mut Canvas) {
     canvas.draw_paint(paint);
 }
 
-fn draw_sweep_gradient_shader(canvas: &mut Canvas) {
+fn draw_sweep_gradient_shader(canvas: &Canvas) {
     let colors = [Color::CYAN, Color::MAGENTA, Color::YELLOW, Color::CYAN];
     let paint = &mut Paint::default();
     paint.set_shader(gradient_shader::sweep(
@@ -275,21 +275,21 @@ fn draw_sweep_gradient_shader(canvas: &mut Canvas) {
     canvas.draw_paint(paint);
 }
 
-fn draw_fractal_perlin_noise_shader(canvas: &mut Canvas) {
+fn draw_fractal_perlin_noise_shader(canvas: &Canvas) {
     canvas.clear(Color::WHITE);
     let paint = &mut Paint::default();
     paint.set_shader(shaders::fractal_noise((0.05, 0.05), 4, 0.0, None));
     canvas.draw_paint(paint);
 }
 
-fn draw_turbulence_perlin_noise_shader(canvas: &mut Canvas) {
+fn draw_turbulence_perlin_noise_shader(canvas: &Canvas) {
     canvas.clear(Color::WHITE);
     let paint = &mut Paint::default();
     paint.set_shader(shaders::turbulence((0.05, 0.05), 4, 0.0, None));
     canvas.draw_paint(paint);
 }
 
-fn draw_compose_shader(canvas: &mut Canvas) {
+fn draw_compose_shader(canvas: &Canvas) {
     let colors = [Color::BLUE, Color::YELLOW];
     let paint = &mut Paint::default();
     paint.set_shader(shaders::blend(
@@ -309,7 +309,7 @@ fn draw_compose_shader(canvas: &mut Canvas) {
     canvas.draw_paint(paint);
 }
 
-fn draw_mask_filter(canvas: &mut Canvas) {
+fn draw_mask_filter(canvas: &Canvas) {
     // TODO: make BlendMode optional in draw_color.
     canvas.draw_color(
         Color::from_argb(0xFF, 0xFF, 0xFF, 0xFF),
@@ -322,8 +322,8 @@ fn draw_mask_filter(canvas: &mut Canvas) {
     canvas.draw_text_blob(blob, (0, 160), paint);
 }
 
-fn draw_color_filter(c: &mut Canvas) {
-    fn f(c: &mut Canvas, (x, y): (scalar, scalar), color_matrix: &[scalar; 20]) {
+fn draw_color_filter(c: &Canvas) {
+    fn f(c: &Canvas, (x, y): (scalar, scalar), color_matrix: &[scalar; 20]) {
         let paint = &mut Paint::default();
         paint.set_color_filter(color_filters::matrix_row_major(color_matrix));
 
@@ -346,7 +346,7 @@ fn draw_color_filter(c: &mut Canvas) {
     f(c, (512.0, 0.0), &grayscale);
 }
 
-fn draw_color_table_color_filter(canvas: &mut Canvas) {
+fn draw_color_table_color_filter(canvas: &Canvas) {
     let image = resources::mandrill();
 
     canvas.scale((0.5, 0.5));
@@ -361,7 +361,7 @@ fn draw_color_table_color_filter(canvas: &mut Canvas) {
     canvas.draw_image(&image, (0, 0), Some(&paint));
 }
 
-fn draw_path_2d_effect(canvas: &mut Canvas) {
+fn draw_path_2d_effect(canvas: &Canvas) {
     let scale = 10.0;
     let path = &mut Path::default();
     let pts: [i8; 28] = [
@@ -385,7 +385,7 @@ fn draw_path_2d_effect(canvas: &mut Canvas) {
     canvas.draw_rect(bounds, paint);
 }
 
-fn draw_line_2d_effect(canvas: &mut Canvas) {
+fn draw_line_2d_effect(canvas: &Canvas) {
     let paint = &mut Paint::default();
     let lattice = &mut Matrix::default();
     lattice.set_scale((8.0, 8.0), None).pre_rotate(30.0, None);
@@ -397,7 +397,7 @@ fn draw_line_2d_effect(canvas: &mut Canvas) {
     canvas.draw_rect(bounds, paint);
 }
 
-fn draw_path_1d_effect(canvas: &mut Canvas) {
+fn draw_path_1d_effect(canvas: &Canvas) {
     let paint = &mut Paint::default();
     let path = &mut Path::default();
     path.add_oval(Rect::from_size((16.0, 6.0)), None);
@@ -427,7 +427,7 @@ fn star() -> Path {
     path
 }
 
-fn draw_corner_path_effect(canvas: &mut Canvas) {
+fn draw_corner_path_effect(canvas: &Canvas) {
     let paint = &mut Paint::default();
     paint
         .set_path_effect(corner_path_effect::new(32.0))
@@ -437,7 +437,7 @@ fn draw_corner_path_effect(canvas: &mut Canvas) {
     canvas.draw_path(&star(), paint);
 }
 
-fn draw_dash_path_effect(canvas: &mut Canvas) {
+fn draw_dash_path_effect(canvas: &Canvas) {
     const INTERVALS: [scalar; 4] = [10.0, 5.0, 2.0, 5.0];
     let paint = &mut Paint::default();
     paint
@@ -449,7 +449,7 @@ fn draw_dash_path_effect(canvas: &mut Canvas) {
     canvas.draw_path(&star(), paint);
 }
 
-fn draw_discrete_path_effect(canvas: &mut Canvas) {
+fn draw_discrete_path_effect(canvas: &Canvas) {
     let paint = &mut Paint::default();
     paint
         .set_path_effect(discrete_path_effect::new(10.0, 4.0, None))
@@ -460,7 +460,7 @@ fn draw_discrete_path_effect(canvas: &mut Canvas) {
     canvas.draw_path(&star(), paint);
 }
 
-fn draw_compose_path_effect(canvas: &mut Canvas) {
+fn draw_compose_path_effect(canvas: &Canvas) {
     const INTERVALS: [scalar; 4] = [10.0, 5.0, 2.0, 5.0];
     let paint = &mut Paint::default();
     paint
@@ -475,7 +475,7 @@ fn draw_compose_path_effect(canvas: &mut Canvas) {
     canvas.draw_path(&star(), paint);
 }
 
-fn draw_sum_path_effect(canvas: &mut Canvas) {
+fn draw_sum_path_effect(canvas: &Canvas) {
     let paint = &mut Paint::default();
     paint
         .set_path_effect(PathEffect::sum(

skia-org/src/skparagraph_example.rs

@@ -10,7 +10,7 @@ pub fn draw(driver: &mut impl DrawingDriver, path: &path::Path) {
     driver.draw_image_256(&path, "lorem-ipsum", draw_lorem_ipsum);
 }
 
-fn draw_lorem_ipsum(canvas: &mut Canvas) {
+fn draw_lorem_ipsum(canvas: &Canvas) {
     let mut font_collection = FontCollection::new();
     font_collection.set_default_font_manager(FontMgr::new(), None);
     let paragraph_style = ParagraphStyle::new();