From f370606fa81851f2a401534adb5b91d7c456e4cc Mon Sep 17 00:00:00 2001
From: sagudev <16504129+sagudev@users.noreply.github.com>
Date: Sat, 21 Jun 2025 11:34:28 +0200
Subject: [PATCH] canvas: Make `draw_options` non optional in `fill_rect`
 (#37603)

All other draw functions already have them non-optional and we always
passed `Some` anyway.

Testing: Existing WPT tests

Signed-off-by: sagudev <16504129+sagudev@users.noreply.github.com>
---
 components/canvas/backend.rs        |  2 +-
 components/canvas/canvas_data.rs    |  4 ++--
 components/canvas/raqote_backend.rs | 14 ++------------
 3 files changed, 5 insertions(+), 15 deletions(-)

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<B: Backend> {
         &mut self,
         rect: &Rect<f32>,
         pattern: B::Pattern<'_>,
-        draw_options: Option<&B::DrawOptions>,
+        draw_options: &B::DrawOptions,
     );
     fn get_size(&self) -> Size2D<i32>;
     fn get_transform(&self) -> Transform2D<f32>;
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<RaqoteBackend> for raqote::DrawTarget {
         &mut self,
         rect: &Rect<f32>,
         pattern: <RaqoteBackend as Backend>::Pattern<'_>,
-        draw_options: Option<&<RaqoteBackend as Backend>::DrawOptions>,
+        draw_options: &<RaqoteBackend as Backend>::DrawOptions,
     ) {
         let mut pb = raqote::PathBuilder::new();
         pb.rect(
@@ -568,18 +568,8 @@ impl GenericDrawTarget<RaqoteBackend> for raqote::DrawTarget {
             rect.size.width,
             rect.size.height,
         );
-        let draw_options = if let Some(options) = draw_options {
-            *options
-        } else {
-            raqote::DrawOptions::new()
-        };
 
-        <Self as GenericDrawTarget<RaqoteBackend>>::fill(
-            self,
-            &pb.finish(),
-            pattern,
-            &draw_options,
-        );
+        <Self as GenericDrawTarget<RaqoteBackend>>::fill(self, &pb.finish(), pattern, draw_options);
     }
     fn get_size(&self) -> Size2D<i32> {
         Size2D::new(self.width(), self.height())