diff --git a/components/canvas/backend.rs b/components/canvas/backend.rs index b7296b81ba3..2c98c92c8d2 100644 --- a/components/canvas/backend.rs +++ b/components/canvas/backend.rs @@ -93,7 +93,7 @@ pub(crate) trait GenericDrawTarget { &mut self, rect: &Rect, pattern: B::Pattern<'_>, - draw_options: Option<&B::DrawOptions>, + draw_options: &B::DrawOptions, ); fn get_size(&self) -> Size2D; fn get_transform(&self) -> Transform2D; diff --git a/components/canvas/canvas_data.rs b/components/canvas/canvas_data.rs index 3d833facc1c..56269517bd8 100644 --- a/components/canvas/canvas_data.rs +++ b/components/canvas/canvas_data.rs @@ -766,14 +766,14 @@ impl<'a, B: Backend> CanvasData<'a, B> { new_draw_target.fill_rect( &draw_rect, self.state.fill_style.clone(), - Some(&self.state.draw_options), + &self.state.draw_options, ); }); } else { self.drawtarget.fill_rect( &draw_rect, self.state.fill_style.clone(), - Some(&self.state.draw_options), + &self.state.draw_options, ); } } diff --git a/components/canvas/raqote_backend.rs b/components/canvas/raqote_backend.rs index 02d87dfcd54..612810255ad 100644 --- a/components/canvas/raqote_backend.rs +++ b/components/canvas/raqote_backend.rs @@ -559,7 +559,7 @@ impl GenericDrawTarget for raqote::DrawTarget { &mut self, rect: &Rect, pattern: ::Pattern<'_>, - draw_options: Option<&::DrawOptions>, + draw_options: &::DrawOptions, ) { let mut pb = raqote::PathBuilder::new(); pb.rect( @@ -568,18 +568,8 @@ impl GenericDrawTarget for raqote::DrawTarget { rect.size.width, rect.size.height, ); - let draw_options = if let Some(options) = draw_options { - *options - } else { - raqote::DrawOptions::new() - }; - >::fill( - self, - &pb.finish(), - pattern, - &draw_options, - ); + >::fill(self, &pb.finish(), pattern, draw_options); } fn get_size(&self) -> Size2D { Size2D::new(self.width(), self.height())