diff --git a/render/canvas/src/lib.rs b/render/canvas/src/lib.rs index a7e1286a8..9ec4c3720 100644 --- a/render/canvas/src/lib.rs +++ b/render/canvas/src/lib.rs @@ -500,7 +500,7 @@ impl RenderBackend for WebCanvasRenderBackend { } } -impl<'a> CommandHandler<'a> for WebCanvasRenderBackend { +impl CommandHandler for WebCanvasRenderBackend { fn render_bitmap(&mut self, bitmap: &BitmapHandle, transform: &Transform, smoothing: bool) { if self.mask_state == MaskState::ClearMask { return; @@ -766,7 +766,7 @@ impl<'a> CommandHandler<'a> for WebCanvasRenderBackend { } } - fn blend(&mut self, commands: &'a CommandList, blend: BlendMode) { + fn blend(&mut self, commands: &CommandList, blend: BlendMode) { self.push_blend_mode(blend); commands.execute(self); self.pop_blend_mode(); diff --git a/render/src/commands.rs b/render/src/commands.rs index 9e75e56a0..9b4165ff5 100644 --- a/render/src/commands.rs +++ b/render/src/commands.rs @@ -4,8 +4,8 @@ use crate::matrix::Matrix; use crate::transform::Transform; use swf::{BlendMode, Color}; -pub trait CommandHandler<'a> { - fn render_bitmap(&mut self, bitmap: &'a BitmapHandle, transform: &Transform, smoothing: bool); +pub trait CommandHandler { + fn render_bitmap(&mut self, bitmap: &BitmapHandle, transform: &Transform, smoothing: bool); fn render_shape(&mut self, shape: ShapeHandle, transform: &Transform); fn draw_rect(&mut self, color: Color, matrix: &Matrix); fn push_mask(&mut self); @@ -13,7 +13,7 @@ pub trait CommandHandler<'a> { fn deactivate_mask(&mut self); fn pop_mask(&mut self); - fn blend(&mut self, commands: &'a CommandList, blend_mode: BlendMode); + fn blend(&mut self, commands: &CommandList, blend_mode: BlendMode); } #[derive(Debug, Default, Clone)] @@ -26,7 +26,7 @@ impl CommandList { Self::default() } - pub fn execute<'a>(&'a self, handler: &mut impl CommandHandler<'a>) { + pub fn execute(&self, handler: &mut impl CommandHandler) { for command in &self.commands { match command { Command::RenderBitmap { @@ -48,8 +48,8 @@ impl CommandList { } } -impl<'a> CommandHandler<'a> for CommandList { - fn render_bitmap(&mut self, bitmap: &'a BitmapHandle, transform: &Transform, smoothing: bool) { +impl CommandHandler for CommandList { + fn render_bitmap(&mut self, bitmap: &BitmapHandle, transform: &Transform, smoothing: bool) { self.commands.push(Command::RenderBitmap { bitmap: bitmap.clone(), transform: transform.clone(), @@ -87,7 +87,7 @@ impl<'a> CommandHandler<'a> for CommandList { self.commands.push(Command::PopMask); } - fn blend(&mut self, commands: &'a CommandList, blend_mode: BlendMode) { + fn blend(&mut self, commands: &CommandList, blend_mode: BlendMode) { self.commands .push(Command::Blend(commands.to_owned(), blend_mode)); } diff --git a/render/webgl/src/lib.rs b/render/webgl/src/lib.rs index fbefe436b..7a6f3f23d 100644 --- a/render/webgl/src/lib.rs +++ b/render/webgl/src/lib.rs @@ -1090,8 +1090,8 @@ impl RenderBackend for WebGlRenderBackend { } } -impl<'a> CommandHandler<'a> for WebGlRenderBackend { - fn render_bitmap(&mut self, bitmap: &'a BitmapHandle, transform: &Transform, smoothing: bool) { +impl CommandHandler for WebGlRenderBackend { + fn render_bitmap(&mut self, bitmap: &BitmapHandle, transform: &Transform, smoothing: bool) { self.set_stencil_state(); let entry = as_registry_data(bitmap); // Adjust the quad draw to use the target bitmap. @@ -1417,7 +1417,7 @@ impl<'a> CommandHandler<'a> for WebGlRenderBackend { self.mask_state_dirty = true; } - fn blend(&mut self, commands: &'a CommandList, blend: BlendMode) { + fn blend(&mut self, commands: &CommandList, blend: BlendMode) { self.push_blend_mode(blend); commands.execute(self); self.pop_blend_mode();