From 88b9ecea3cdb2baf19b0ecfede011150202bf98b Mon Sep 17 00:00:00 2001
From: Oriol Brufau <obrufau@igalia.com>
Date: Sat, 29 Apr 2023 07:24:13 +0200
Subject: [PATCH] Fix corner clipping typos in layout-2020

inner_radii() had a minus sign that shouldn't be there.

And padding_edge_clip() and content_edge_clip() clearly need to to use
the padding_rect() and content_rect() instead of border_rect.

Tests:
  - css/css-backgrounds/background-clip-padding-box-with-border-radius.html
  - css/css-backgrounds/background-rounded-image-clip.html
---
 components/layout_2020/display_list/mod.rs                  | 6 +++---
 .../background-clip-padding-box-with-border-radius.html.ini | 2 --
 .../css-backgrounds/background-rounded-image-clip.html.ini  | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/background-clip-padding-box-with-border-radius.html.ini
 delete mode 100644 tests/wpt/metadata-layout-2020/css/css-backgrounds/background-rounded-image-clip.html.ini

diff --git a/components/layout_2020/display_list/mod.rs b/components/layout_2020/display_list/mod.rs
index ae34c5ad952..f85bf5b1a47 100644
--- a/components/layout_2020/display_list/mod.rs
+++ b/components/layout_2020/display_list/mod.rs
@@ -374,7 +374,7 @@ impl<'a> BuilderForBoxFragment<'a> {
                         .to_physical(self.fragment.style.writing_mode)
                         .to_webrender(),
                 ),
-                self.border_rect,
+                *self.padding_rect(),
                 builder,
             )
         })
@@ -389,7 +389,7 @@ impl<'a> BuilderForBoxFragment<'a> {
                         .to_physical(self.fragment.style.writing_mode)
                         .to_webrender(),
                 ),
-                self.border_rect,
+                *self.content_rect(),
                 builder,
             )
         })
@@ -662,7 +662,7 @@ fn image_rendering(ir: style::computed_values::image_rendering::T) -> wr::ImageR
 
 /// Radii for the padding edge or content edge
 fn inner_radii(mut radii: wr::BorderRadius, offsets: units::LayoutSideOffsets) -> wr::BorderRadius {
-    radii.top_left.width -= -offsets.left;
+    radii.top_left.width -= offsets.left;
     radii.bottom_left.width -= offsets.left;
 
     radii.top_right.width -= offsets.right;
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-clip-padding-box-with-border-radius.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-clip-padding-box-with-border-radius.html.ini
deleted file mode 100644
index a0a99cae381..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-clip-padding-box-with-border-radius.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-clip-padding-box-with-border-radius.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-rounded-image-clip.html.ini b/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-rounded-image-clip.html.ini
deleted file mode 100644
index 5652f8af961..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-backgrounds/background-rounded-image-clip.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[background-rounded-image-clip.html]
-  expected: FAIL