1 files changed, 71 insertions, 23 deletions

diff --git a/renderer/src/compositor.rs b/renderer/src/compositor.rs
index a353b8e4..8b17a4b0 100644
--- a/renderer/src/compositor.rs
+++ b/renderer/src/compositor.rs
@@ -100,26 +100,28 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
         background_color: Color,
         overlay: &[T],
     ) -> Result<(), SurfaceError> {
-        renderer.with_primitives(|backend, primitives| {
-            match (self, backend, surface) {
-                (
-                    Self::TinySkia(_compositor),
-                    crate::Backend::TinySkia(backend),
-                    Surface::TinySkia(surface),
-                ) => iced_tiny_skia::window::compositor::present(
+        match (self, renderer, surface) {
+            (
+                Self::TinySkia(_compositor),
+                crate::Renderer::TinySkia(renderer),
+                Surface::TinySkia(surface),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_tiny_skia::window::compositor::present(
                     backend,
                     surface,
                     primitives,
                     viewport,
                     background_color,
                     overlay,
-                ),
-                #[cfg(feature = "wgpu")]
-                (
-                    Self::Wgpu(compositor),
-                    crate::Backend::Wgpu(backend),
-                    Surface::Wgpu(surface),
-                ) => iced_wgpu::window::compositor::present(
+                )
+            }),
+            #[cfg(feature = "wgpu")]
+            (
+                Self::Wgpu(compositor),
+                crate::Renderer::Wgpu(renderer),
+                Surface::Wgpu(surface),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_wgpu::window::compositor::present(
                     compositor,
                     backend,
                     surface,
@@ -127,14 +129,60 @@ impl<Theme> crate::graphics::Compositor for Compositor<Theme> {
                     viewport,
                     background_color,
                     overlay,
-                ),
-                #[allow(unreachable_patterns)]
-                _ => panic!(
-                    "The provided renderer or surface are not compatible \
+                )
+            }),
+            #[allow(unreachable_patterns)]
+            _ => panic!(
+                "The provided renderer or surface are not compatible \
                     with the compositor."
-                ),
-            }
-        })
+            ),
+        }
+    }
+
+    fn screenshot<T: AsRef<str>>(
+        &mut self,
+        renderer: &mut Self::Renderer,
+        surface: &mut Self::Surface,
+        viewport: &Viewport,
+        background_color: Color,
+        overlay: &[T],
+    ) -> Vec<u8> {
+        match (self, renderer, surface) {
+            (
+                Self::TinySkia(_compositor),
+                Renderer::TinySkia(renderer),
+                Surface::TinySkia(surface),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_tiny_skia::window::compositor::screenshot(
+                    surface,
+                    backend,
+                    primitives,
+                    viewport,
+                    background_color,
+                    overlay,
+                )
+            }),
+            #[cfg(feature = "wgpu")]
+            (
+                Self::Wgpu(compositor),
+                Renderer::Wgpu(renderer),
+                Surface::Wgpu(_),
+            ) => renderer.with_primitives(|backend, primitives| {
+                iced_wgpu::window::compositor::screenshot(
+                    compositor,
+                    backend,
+                    primitives,
+                    viewport,
+                    background_color,
+                    overlay,
+                )
+            }),
+            #[allow(unreachable_patterns)]
+            _ => panic!(
+                "The provided renderer or backend are not compatible \
+                with the compositor."
+            ),
+        }
     }
 }
 
@@ -185,7 +233,7 @@ impl Candidate {
 
                 Ok((
                     Compositor::TinySkia(compositor),
-                    Renderer::new(crate::Backend::TinySkia(backend)),
+                    Renderer::TinySkia(iced_tiny_skia::Renderer::new(backend)),
                 ))
             }
             #[cfg(feature = "wgpu")]
@@ -202,7 +250,7 @@ impl Candidate {
 
                 Ok((
                     Compositor::Wgpu(compositor),
-                    Renderer::new(crate::Backend::Wgpu(backend)),
+                    Renderer::Wgpu(iced_wgpu::Renderer::new(backend)),
                 ))
             }
             #[cfg(not(feature = "wgpu"))]