InteractionRegions: elements with explicitly set border-radius shou…

…ld not get the default radius https://bugs.webkit.org/show_bug.cgi?id=263611 <rdar://116815739> Reviewed by Tim Horton. When an element has a border radius explicitly set, even when set to 0, avoid adding the default radius to the corresponding InteractionRegion. * Source/WebCore/page/InteractionRegion.cpp: (WebCore::interactionRegionForRenderedRegion): Check if the RenderStyle has an explicitly set border-radius. * LayoutTests/interaction-region/border-radii-expected.txt: * LayoutTests/interaction-region/border-radii.html: Add test cases covering this change. Canonical link: https://commits.webkit.org/269755@main
WebKit · Oct 25, 2023 · e699017 · e699017
1 parent 88f9ef0
commit e699017
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/LayoutTests/interaction-region/border-radii-expected.txt b/LayoutTests/interaction-region/border-radii-expected.txt
@@ -1,4 +1,4 @@
-uniform half pill diagonal tongue degenerate changing
+uniform half pill diagonal tongue degenerate changing default explicit
 (GraphicsLayer
   (anchor 0.00 0.00)
   (bounds 800.00 600.00)
@@ -23,7 +23,11 @@ uniform half pill diagonal tongue degenerate changing
         (interaction (434,10) width=102 height=52)
         (borderRadius 2.00),
         (interaction (559,10) width=92 height=52)
-        (borderRadius 20.00)])
+        (borderRadius 20.00),
+        (interaction (674,10) width=77 height=52)
+        (borderRadius 8.00),
+        (interaction (10,82) width=80 height=52)
+        (borderRadius 0.00)])
       )
     )
   )

diff --git a/LayoutTests/interaction-region/border-radii.html b/LayoutTests/interaction-region/border-radii.html
@@ -28,6 +28,14 @@
     .changed {
         border-radius: 20px;
     }
+
+    .default, .explicit {
+        background: transparent;
+        color: black;
+    }
+    .explicit {
+        border-radius: 0;
+    }
 </style>
 <script src="../resources/ui-helper.js"></script>
 <body>
@@ -37,6 +45,8 @@
 <div class="tongue">tongue</div>
 <div class="degenerate">degenerate</div>
 <div class="changing">changing</div>
+<div class="default">default</div>
+<div class="explicit">explicit</div>
 <pre id="results"></pre>
 <script>
 document.body.addEventListener("click", function(e) {

diff --git a/Source/WebCore/page/InteractionRegion.cpp b/Source/WebCore/page/InteractionRegion.cpp
@@ -312,7 +312,7 @@ std::optional<InteractionRegion> interactionRegionForRenderedRegion(RenderObject
         }
     }
 
-    if (!regionRenderer.hasVisibleBoxDecorations() && !renderer.hasVisibleBoxDecorations()) {
+    if (!regionRenderer.hasVisibleBoxDecorations() && !renderer.hasVisibleBoxDecorations() && !renderer.style().hasExplicitlySetBorderRadius()) {
         // We can safely tweak the bounds and radius without causing visual mismatch.
         borderRadius = std::max<float>(borderRadius, regionRenderer.document().settings().interactionRegionMinimumCornerRadius());
         if (isInlineNonBlock)