From b52ad6b19d1a80071f1aef489edf65ae1abcaed1 Mon Sep 17 00:00:00 2001
From: Etienne Segonzac <sgz@apple.com>
Date: Wed, 20 Dec 2023 13:43:10 -0800
Subject: [PATCH] [InteractionRegions] Add support for all non-uniform
 border-radius https://bugs.webkit.org/show_bug.cgi?id=266491
 <rdar://118884255>

Reviewed by Tim Horton.

To support all `border-radius` configurations on InteractionRegions,
introduce an optional clip path.
Generate RoundedRect based Paths when the corner radii are not uniform.
Continue using masked corners when they can fully capture the shape.
Use `PathUtilities::pathWithShrinkWrappedRects` for elements with
multiple rects (like multi-line links).

* Source/WebCore/page/InteractionRegion.h:
Add an optional clip Path.
Rename borderRadius to cornerRadius to make it clearer that it works
with maskedCorners.
(WebCore::operator==):
Re-introduce a custom `==` operator. The compiler can't generate one now
that the struct contains a Path.
* Source/WebCore/page/InteractionRegion.cpp:
Remove the unused `PathUtilities.h` include.
(WebCore::interactionRegionForRenderedRegion):
Add an optional clip Path.
When the border radii are not uniform, generate a `clipPath` from
`RenderBox#borderRoundedRect()`.
(WebCore::operator<<):
Update the dump format for the new clipPath field.
Only dump the cornerRadius/masked corners when it is greater than 0.

* Source/WebCore/rendering/RenderBox.h:
* Source/WebCore/rendering/RenderBox.cpp:
(WebCore::RenderBox::borderRoundedRect const):
Add a method we can use for to generate either clip paths or masked
corners.

* Source/WebCore/rendering/EventRegion.h:
Instead of accumulating the discovered rects for an element in a Region,
use a Vector<FloatRect>> (to avoid rounding to an IntRect).
* Source/WebCore/rendering/EventRegion.cpp:
(WebCore::EventRegionContext::uniteInteractionRegions):
Accumulate the discovered rects for an element in a Vector instead of a
Region.
(WebCore::EventRegionContext::shouldConsolidateInteractionRegion):
Only consider consolidation with elements that have a single discovered
rect (can't consolidate to a multi-line link).
(WebCore::EventRegionContext::shrinkWrapInteractionRegions):
Replace the shrink wrapping code with the great
`PathUtilities::pathsWithShrinkWrappedRects`.
This yields a single InteractionRegion with the proper rect and clip
path.
(WebCore::EventRegionContext::removeSuperfluousInteractionRegions):
Update the guard overlapping logic to iterate over all known interaction
rects (as opposed to checking once against each discovered Region).

* Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in:
Add an optional clip Path.

* Source/WebCore/rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::paintDebugOverlays):
* Source/WebCore/page/DebugPageOverlays.cpp:
(WebCore::InteractionRegionOverlay::activeRegion const):
(WebCore::InteractionRegionOverlay::drawRect):
borderRadius -> cornerRadius

* Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeInteractionRegionLayers.mm:
(WebKit::updateLayersForInteractionRegions):
Generate a CAShapeLayer from the clipPath when present, and use it to
mask the InteractionRegion layer.

* Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm:
(-[WKWebView _caLayerTreeAsText]):
Dump the layer tree of the content view instead of the whole WKWebView.
This makes the expectation files clearer and will help prevent churn
when unrelated part of the code change.
(dumpCALayer):
Add basic support for layer and corner masking in the dump.

* LayoutTests/interaction-region/border-radii.html:
* LayoutTests/interaction-region/border-radii-expected.txt:
This test already has non-uniform examples. Add borders and update
expectations.
* LayoutTests/interaction-region/guard-overlap.html:
* LayoutTests/interaction-region/guard-overlap-expected.txt:
Add a test with a guard overlapping a multi-line link.
* LayoutTests/interaction-region/layer-tree.html:
* LayoutTests/interaction-region/layer-tree-expected.txt:
Add various shape cases to the layer test to cover the UIProcess
changes.
* LayoutTests/interaction-region/layer-tree-shape-reset-expected.txt: Added.
* LayoutTests/interaction-region/layer-tree-shape-reset.html: Added.
Add a new test making sure all shaping properties on InteractionRegion
layers are properly reset if the style updates.
* LayoutTests/interaction-region/aria-roles-expected.txt:
* LayoutTests/interaction-region/button-in-link-expected.txt:
* LayoutTests/interaction-region/click-handler-dynamically-added-expected.txt:
* LayoutTests/interaction-region/click-handler-expected.txt:
* LayoutTests/interaction-region/click-handler-in-shadowed-layer-expected.txt:
* LayoutTests/interaction-region/consolidated-nested-regions-expected.txt:
* LayoutTests/interaction-region/display-table-expected.txt:
* LayoutTests/interaction-region/event-region-overflow-expected.txt:
* LayoutTests/interaction-region/full-page-overlay-expected.txt:
* LayoutTests/interaction-region/hover-style-expected.txt:
* LayoutTests/interaction-region/icon-inside-button-single-region-expected.txt:
* LayoutTests/interaction-region/ignore-catch-all-body-expected.txt:
* LayoutTests/interaction-region/inline-link-dark-background-expected.txt:
* LayoutTests/interaction-region/inline-link-expected.txt:
* LayoutTests/interaction-region/inline-link-in-composited-iframe-expected.txt:
* LayoutTests/interaction-region/inline-link-in-layer-expected.txt:
* LayoutTests/interaction-region/inline-link-in-non-composited-iframe-expected.txt:
* LayoutTests/interaction-region/inline-link-with-pointer-events-none-content-expected.txt:
* LayoutTests/interaction-region/input-type-file-region-expected.txt:
* LayoutTests/interaction-region/input-type-range-region-expected.txt:
* LayoutTests/interaction-region/interaction-layers-culling-expected.txt:
* LayoutTests/interaction-region/interaction-layers-culling-layer-type-change-expected.txt:
* LayoutTests/interaction-region/interaction-region-size-limit-expected.txt:
* LayoutTests/interaction-region/labels-expected.txt:
* LayoutTests/interaction-region/nested-composited-text-painter-expected.txt:
* LayoutTests/interaction-region/overlap-expected.txt:
* LayoutTests/interaction-region/overlap-same-group-expected.txt:
* LayoutTests/interaction-region/overlay-expected.txt:
* LayoutTests/interaction-region/paused-video-regions-expected.txt:
* LayoutTests/interaction-region/position-only-update-expected.txt:
* LayoutTests/interaction-region/pseudo-element-expected.txt:
* LayoutTests/interaction-region/split-inline-link-expected.txt:
* LayoutTests/interaction-region/text-controls-expected.txt:
* LayoutTests/interaction-region/text-input-expected.txt:
* LayoutTests/interaction-region/tiny-regions-expected.txt:
* LayoutTests/interaction-region/wrapped-inline-link-expected.txt:
Update test expectations with clip paths and the new dump format.

Canonical link: https://commits.webkit.org/272377@main
---
 .../aria-roles-expected.txt                   |  12 +-
 .../border-radii-expected.txt                 |  43 +-
 .../interaction-region/border-radii.html      |   9 +
 .../button-in-link-expected.txt               |   5 +-
 ...ick-handler-dynamically-added-expected.txt |   2 +-
 .../click-handler-expected.txt                |   2 +-
 ...ick-handler-in-shadowed-layer-expected.txt |   2 +-
 .../consolidated-nested-regions-expected.txt  |  23 +-
 .../display-table-expected.txt                |   5 +-
 .../event-region-overflow-expected.txt        |   2 +-
 .../full-page-overlay-expected.txt            |   3 +-
 .../guard-overlap-expected.txt                |  21 +-
 .../interaction-region/guard-overlap.html     |   8 +
 .../hover-style-expected.txt                  |   7 +-
 ...n-inside-button-single-region-expected.txt |   2 +-
 .../ignore-catch-all-body-expected.txt        |   2 +-
 .../inline-link-dark-background-expected.txt  |   2 +-
 .../inline-link-expected.txt                  |  38 +-
 ...ine-link-in-composited-iframe-expected.txt |   4 +-
 .../inline-link-in-layer-expected.txt         |   4 +-
 ...link-in-non-composited-iframe-expected.txt |   4 +-
 ...h-pointer-events-none-content-expected.txt |   2 +-
 .../input-type-file-region-expected.txt       |   5 +-
 .../input-type-range-region-expected.txt      |   5 +-
 .../interaction-layers-culling-expected.txt   | 369 +++-------------
 ...ers-culling-layer-type-change-expected.txt | 329 ++------------
 ...interaction-region-size-limit-expected.txt |   6 +-
 .../interaction-region/labels-expected.txt    |   7 +-
 .../layer-tree-expected.txt                   | 406 ++++--------------
 .../layer-tree-shape-reset-expected.txt       |  55 +++
 .../layer-tree-shape-reset.html               |  70 +++
 .../interaction-region/layer-tree.html        |  28 ++
 ...ested-composited-text-painter-expected.txt |   2 +-
 .../interaction-region/overlap-expected.txt   |   6 +-
 .../overlap-same-group-expected.txt           |   8 +-
 .../interaction-region/overlay-expected.txt   |   6 +-
 .../paused-video-regions-expected.txt         |   2 +-
 .../position-only-update-expected.txt         |   2 +-
 .../pseudo-element-expected.txt               |   2 +-
 .../split-inline-link-expected.txt            |   6 +-
 .../text-controls-expected.txt                |   4 +-
 .../text-input-expected.txt                   |  15 +-
 .../tiny-regions-expected.txt                 |   9 +-
 .../wrapped-inline-link-expected.txt          |  22 +-
 Source/WebCore/page/DebugPageOverlays.cpp     |   4 +-
 Source/WebCore/page/InteractionRegion.cpp     |  64 ++-
 Source/WebCore/page/InteractionRegion.h       |  17 +-
 Source/WebCore/rendering/EventRegion.cpp      | 151 +++----
 Source/WebCore/rendering/EventRegion.h        |   2 +-
 Source/WebCore/rendering/RenderBox.cpp        |   9 +
 Source/WebCore/rendering/RenderBox.h          |   1 +
 .../WebCore/rendering/RenderLayerBacking.cpp  |   2 +-
 .../WebCoreArgumentCoders.serialization.in    |   3 +-
 .../UIProcess/API/Cocoa/WKWebViewTesting.mm   |  17 +-
 .../RemoteLayerTreeInteractionRegionLayers.mm |  16 +-
 55 files changed, 618 insertions(+), 1234 deletions(-)
 create mode 100644 LayoutTests/interaction-region/layer-tree-shape-reset-expected.txt
 create mode 100644 LayoutTests/interaction-region/layer-tree-shape-reset.html

diff --git a/LayoutTests/interaction-region/aria-roles-expected.txt b/LayoutTests/interaction-region/aria-roles-expected.txt
index cf8500258d2d..8f363197c340 100644
--- a/LayoutTests/interaction-region/aria-roles-expected.txt
+++ b/LayoutTests/interaction-region/aria-roles-expected.txt
@@ -18,17 +18,17 @@ This works like a switch.
 
       (interaction regions [
         (interaction (0,0) width=800 height=20)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (0,20) width=800 height=20)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (40,56) width=760 height=20)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (40,76) width=760 height=20)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (40,96) width=760 height=20)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (0,132) width=800 height=20)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/border-radii-expected.txt b/LayoutTests/interaction-region/border-radii-expected.txt
index 3f7c9a35a734..2389439bef86 100644
--- 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 default explicit
+uniform half pill diagonal tongue degenerate big border changing default explicit
 (GraphicsLayer
   (anchor 0.00 0.00)
   (bounds 800.00 600.00)
@@ -12,22 +12,31 @@ uniform half pill diagonal tongue degenerate changing default explicit
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (10,10) width=83.50 height=52)
-        (borderRadius 12.00),
-        (interaction (117.50,10) width=82.50 height=52)
-        (borderRadius 20 0 0 20),
-        (interaction (224,10) width=87 height=52)
-        (borderRadius 16 0 16 0),
-        (interaction (335,10) width=75.50 height=52)
-        (borderRadius 0 0 10 10),
-        (interaction (434.50,10) width=101 height=52)
-        (borderRadius 2.00),
-        (interaction (559.50,10) width=91 height=52)
-        (borderRadius 20.00),
-        (interaction (674.50,10) width=76.50 height=52)
-        (borderRadius 8.00),
-        (interaction (10,82) width=80 height=52)
-        (borderRadius 0.00)])
+        (interaction (10,16) width=91.50 height=60)
+        (cornerRadius 12.00),
+        (interaction (125.50,20) width=82.50 height=52)
+        (cornerRadius 20 0 0 20),
+        (interaction (232,18) width=91 height=56)
+        (cornerRadius 16 0 16 0),
+        (interaction (347,20) width=75.50 height=52)
+        (cornerRadius 0 0 10 10),
+        (interaction (446.50,19) width=103 height=54)
+        (clipPath add rounded rect (0,0) width=103.28 height=54
+          (top-left width=2 height=2)
+          (top-right width=16 height=16)
+          (bottom-left width=18 height=18)
+          (bottom-right width=10 height=10)),
+        (interaction (573.50,10) width=138.50 height=72)
+        (clipPath add rounded rect (0,0) width=138.20 height=72
+          (top-left width=0 height=0)
+          (top-right width=16 height=16)
+          (bottom-left width=0 height=0)
+          (bottom-right width=18 height=18)),
+        (interaction (10,102) width=90.50 height=52)
+        (cornerRadius 20.00),
+        (interaction (124.50,102) width=76.50 height=52)
+        (cornerRadius 8.00),
+        (interaction (225,102) width=80 height=52)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/border-radii.html b/LayoutTests/interaction-region/border-radii.html
index a799110b537f..8ce1d9c1f818 100644
--- a/LayoutTests/interaction-region/border-radii.html
+++ b/LayoutTests/interaction-region/border-radii.html
@@ -12,18 +12,26 @@
     }
     .uniform {
         border-radius: 12px;
+        border: 4px black solid;
     }
     .half-pill {
         border-radius: 20px 0 0 20px;
     }
     .diagonal {
         border-radius: 16px 0 16px 0;
+        border: 2px black solid;
     }
     .tongue {
         border-radius: 0 0 10px 10px;
     }
     .degenerate {
         border-radius: 2px 16px 10px 18px;
+        border: 1px black solid;
+    }
+    .big-border {
+        border-radius: 0 16px 18px 0;
+        border: 10px purple solid;
+        border-left: 30px red solid;
     }
     .changed {
         border-radius: 20px;
@@ -44,6 +52,7 @@
 <div class="diagonal">diagonal</div>
 <div class="tongue">tongue</div>
 <div class="degenerate">degenerate</div>
+<div class="big-border">big border</div>
 <div class="changing">changing</div>
 <div class="default">default</div>
 <div class="explicit">explicit</div>
diff --git a/LayoutTests/interaction-region/button-in-link-expected.txt b/LayoutTests/interaction-region/button-in-link-expected.txt
index da203462c856..1bba533751d4 100644
--- a/LayoutTests/interaction-region/button-in-link-expected.txt
+++ b/LayoutTests/interaction-region/button-in-link-expected.txt
@@ -12,10 +12,9 @@ Some text but also a button
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (20,20) width=442 height=67)
-        (borderRadius 0.00),
+        (interaction (20,20) width=442 height=67),
         (interaction (270,41) width=171 height=23)
-        (borderRadius 6.00)])
+        (cornerRadius 6.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/click-handler-dynamically-added-expected.txt b/LayoutTests/interaction-region/click-handler-dynamically-added-expected.txt
index 413bdf54e530..d09cdd97c2e6 100644
--- a/LayoutTests/interaction-region/click-handler-dynamically-added-expected.txt
+++ b/LayoutTests/interaction-region/click-handler-dynamically-added-expected.txt
@@ -12,7 +12,7 @@
 
       (interaction regions [
         (interaction (0,0) width=100 height=100)
-        (borderRadius 10.00)])
+        (cornerRadius 10.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/click-handler-expected.txt b/LayoutTests/interaction-region/click-handler-expected.txt
index 413bdf54e530..d09cdd97c2e6 100644
--- a/LayoutTests/interaction-region/click-handler-expected.txt
+++ b/LayoutTests/interaction-region/click-handler-expected.txt
@@ -12,7 +12,7 @@
 
       (interaction regions [
         (interaction (0,0) width=100 height=100)
-        (borderRadius 10.00)])
+        (cornerRadius 10.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/click-handler-in-shadowed-layer-expected.txt b/LayoutTests/interaction-region/click-handler-in-shadowed-layer-expected.txt
index aa1998cf51ea..82970fd58496 100644
--- a/LayoutTests/interaction-region/click-handler-in-shadowed-layer-expected.txt
+++ b/LayoutTests/interaction-region/click-handler-in-shadowed-layer-expected.txt
@@ -21,7 +21,7 @@
 
           (interaction regions [
             (interaction (28,28) width=100 height=100)
-            (borderRadius 10.00)])
+            (cornerRadius 10.00)])
           )
         )
       )
diff --git a/LayoutTests/interaction-region/consolidated-nested-regions-expected.txt b/LayoutTests/interaction-region/consolidated-nested-regions-expected.txt
index 024e252efb84..e9de06725424 100644
--- a/LayoutTests/interaction-region/consolidated-nested-regions-expected.txt
+++ b/LayoutTests/interaction-region/consolidated-nested-regions-expected.txt
@@ -15,25 +15,22 @@ labels y aligned Secondary
 
       (interaction regions [
         (interaction (0,0) width=124.50 height=100)
-        (borderRadius 12.00),
+        (cornerRadius 12.00),
         (interaction (128.50,0) width=124.50 height=100)
-        (borderRadius 12.00),
+        (cornerRadius 12.00),
         (interaction (148.50,20) width=84.50 height=60)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (257,0) width=124.50 height=100)
-        (borderRadius 12.00),
+        (cornerRadius 12.00),
         (interaction (294,20) width=67.50 height=20)
-        (borderRadius 5.00),
-        (interaction (0,100) width=400 height=400)
-        (borderRadius 0.00),
-        (interaction (200,150) width=122 height=122)
-        (borderRadius 0.00),
+        (cornerRadius 5.00),
+        (interaction (0,100) width=400 height=400),
+        (interaction (200,150) width=122 height=122),
         (interaction (253.50,151) width=67.50 height=20)
-        (borderRadius 5.00),
-        (interaction (0,500) width=240 height=100)
-        (borderRadius 0.00),
+        (cornerRadius 5.00),
+        (interaction (0,500) width=240 height=100),
         (interaction (172.50,500) width=67.50 height=20)
-        (borderRadius 5.00)])
+        (cornerRadius 5.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/display-table-expected.txt b/LayoutTests/interaction-region/display-table-expected.txt
index 85c3a983f192..4b1ded82381b 100644
--- a/LayoutTests/interaction-region/display-table-expected.txt
+++ b/LayoutTests/interaction-region/display-table-expected.txt
@@ -13,10 +13,9 @@ is a link with display: table.
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (guard (0,-10) width=28.45 height=39)
-        (borderRadius 0.00),
+        (guard (0,-10) width=28.45 height=39),
         (interaction (0,0) width=28.45 height=19)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/event-region-overflow-expected.txt b/LayoutTests/interaction-region/event-region-overflow-expected.txt
index c4cc3d6b44f9..da0f95ca8faf 100644
--- a/LayoutTests/interaction-region/event-region-overflow-expected.txt
+++ b/LayoutTests/interaction-region/event-region-overflow-expected.txt
@@ -13,7 +13,7 @@ Hi
 
       (interaction regions [
         (interaction (29,21) width=50 height=50)
-        (borderRadius 8.75)])
+        (cornerRadius 8.75)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/full-page-overlay-expected.txt b/LayoutTests/interaction-region/full-page-overlay-expected.txt
index eabbfc26f1b2..d5ecab4bbc1d 100644
--- a/LayoutTests/interaction-region/full-page-overlay-expected.txt
+++ b/LayoutTests/interaction-region/full-page-overlay-expected.txt
@@ -11,8 +11,7 @@
         (rect (0,0) width=1536 height=5013)
 
       (interaction regions [
-        (occlusion (0,0) width=1536 height=5000)
-        (borderRadius 0.00)])
+        (occlusion (0,0) width=1536 height=5000)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/guard-overlap-expected.txt b/LayoutTests/interaction-region/guard-overlap-expected.txt
index b94ac50446a4..39e7e0f95e9f 100644
--- a/LayoutTests/interaction-region/guard-overlap-expected.txt
+++ b/LayoutTests/interaction-region/guard-overlap-expected.txt
@@ -1,4 +1,7 @@
 
+
+This is a multi-line
+line link.
 (GraphicsLayer
   (anchor 0.00 0.00)
   (bounds 800.00 600.00)
@@ -12,16 +15,14 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (0,0) width=100 height=10)
-        (borderRadius 0.00),
-        (interaction (0,10) width=50 height=10)
-        (borderRadius 0.00),
-        (interaction (0,40) width=100 height=25)
-        (borderRadius 0.00),
-        (guard (-10,55) width=30 height=30)
-        (borderRadius 0.00),
-        (interaction (0,65) width=10 height=10)
-        (borderRadius 0.00)])
+        (interaction (0,0) width=100 height=10),
+        (interaction (0,10) width=50 height=10),
+        (interaction (0,40) width=100 height=25),
+        (guard (-10,55) width=30 height=30),
+        (interaction (0,65) width=10 height=10),
+        (interaction (-4,91) width=129.32 height=47)
+        (clipPath move to (0,8), add line to (0,8), add curve to (0,3.58) (3.58,0) (8,0), add line to (121.32,0), add line to (121.32,0), add curve to (125.74,0) (129.32,3.58) (129.32,8), add line to (129.32,19), add line to (129.32,19), add curve to (129.32,23.42) (125.74,27) (121.32,27), add line to (72.88,27), add line to (72.88,27), add curve to (68.46,27) (64.88,30.58) (64.88,35), add line to (64.88,39), add line to (64.88,39), add curve to (64.88,43.42) (61.30,47) (56.88,47), add line to (8,47), add line to (8,47), add curve to (3.58,47) (0,43.42) (0,39), add line to (0,30.50), add line to (0,27), add line to (0,23.50), add line to (0,20), close subpath),
+        (interaction (0,135) width=50 height=10)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/guard-overlap.html b/LayoutTests/interaction-region/guard-overlap.html
index 8d5f848011cb..f7f49a86d541 100644
--- a/LayoutTests/interaction-region/guard-overlap.html
+++ b/LayoutTests/interaction-region/guard-overlap.html
@@ -19,6 +19,14 @@
 <div class="interaction" style="height: 25px; width: 100px" onclick="click()"></div>
 <div class="interaction" style="width: 10px" onclick="click()"></div>
 
+<br />
+
+<a href="#">
+    This is a multi-line<br />
+    line link.
+</a>
+<div class="interaction" style="width: 50px" onclick="click()"></div>
+
 <pre id="results"></pre>
 <script>
 if (window.testRunner)
diff --git a/LayoutTests/interaction-region/hover-style-expected.txt b/LayoutTests/interaction-region/hover-style-expected.txt
index 96bbb72a3c83..2d8dca5227e1 100644
--- a/LayoutTests/interaction-region/hover-style-expected.txt
+++ b/LayoutTests/interaction-region/hover-style-expected.txt
@@ -13,11 +13,10 @@ not a button
 
       (interaction regions [
         (interaction (0,0) width=100 height=100)
-        (borderRadius 10.00),
-        (interaction (0,100) width=108 height=108)
-        (borderRadius 0.00),
+        (cornerRadius 10.00),
+        (interaction (0,100) width=108 height=108),
         (interaction (0,358) width=100 height=100)
-        (borderRadius 10.00)])
+        (cornerRadius 10.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/icon-inside-button-single-region-expected.txt b/LayoutTests/interaction-region/icon-inside-button-single-region-expected.txt
index 3397773aa9c3..f992005586d4 100644
--- a/LayoutTests/interaction-region/icon-inside-button-single-region-expected.txt
+++ b/LayoutTests/interaction-region/icon-inside-button-single-region-expected.txt
@@ -15,7 +15,7 @@ button
 
       (interaction regions [
         (interaction (0,3) width=58.50 height=30)
-        (borderRadius 14.00)])
+        (cornerRadius 15.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/ignore-catch-all-body-expected.txt b/LayoutTests/interaction-region/ignore-catch-all-body-expected.txt
index a712d93e0058..5401826273c3 100644
--- a/LayoutTests/interaction-region/ignore-catch-all-body-expected.txt
+++ b/LayoutTests/interaction-region/ignore-catch-all-body-expected.txt
@@ -13,7 +13,7 @@ an actual link
 
       (interaction regions [
         (interaction (-4,196) width=94.19 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/inline-link-dark-background-expected.txt b/LayoutTests/interaction-region/inline-link-dark-background-expected.txt
index 0291cff428fd..bee0d9bb1572 100644
--- a/LayoutTests/interaction-region/inline-link-dark-background-expected.txt
+++ b/LayoutTests/interaction-region/inline-link-dark-background-expected.txt
@@ -13,7 +13,7 @@ This is a link.
 
       (interaction regions [
         (interaction (-4,-4) width=36.45 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/inline-link-expected.txt b/LayoutTests/interaction-region/inline-link-expected.txt
index c7f5aa3cc869..3c7d2e1d18bd 100644
--- a/LayoutTests/interaction-region/inline-link-expected.txt
+++ b/LayoutTests/interaction-region/inline-link-expected.txt
@@ -13,33 +13,23 @@ This is a link. This is a wiki-style link. This is a link with a background. Thi
 
       (interaction regions [
         (interaction (-4,-4) width=36.45 height=27)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (87.11,-4) width=36.45 height=27)
-        (borderRadius 8.00),
-        (guard (250.21,-10) width=28.45 height=39)
-        (borderRadius 0.00),
-        (interaction (250.21,0) width=28.45 height=19)
-        (borderRadius 0.00),
-        (guard (464.40,-10) width=28.45 height=39)
-        (borderRadius 0.00),
-        (interaction (464.40,0) width=28.45 height=19)
-        (borderRadius 0.00),
-        (guard (657.49,-10) width=28.45 height=39)
-        (borderRadius 0.00),
-        (interaction (657.49,0) width=28.45 height=19)
-        (borderRadius 0.00),
-        (guard (131.98,10) width=28.45 height=39)
-        (borderRadius 0.00),
-        (interaction (131.98,20) width=28.45 height=19)
-        (borderRadius 0.00),
-        (guard (431.60,10) width=28.45 height=39)
-        (borderRadius 0.00),
-        (interaction (431.60,20) width=28.45 height=19)
-        (borderRadius 0.00),
+        (cornerRadius 8.00),
+        (guard (250.21,-10) width=28.45 height=39),
+        (interaction (250.21,0) width=28.45 height=19),
+        (guard (464.40,-10) width=28.45 height=39),
+        (interaction (464.40,0) width=28.45 height=19),
+        (guard (657.49,-10) width=28.45 height=39),
+        (interaction (657.49,0) width=28.45 height=19),
+        (guard (131.98,10) width=28.45 height=39),
+        (interaction (131.98,20) width=28.45 height=19),
+        (guard (431.60,10) width=28.45 height=39),
+        (interaction (431.60,20) width=28.45 height=19),
         (interaction (642.10,16) width=128.99 height=27)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (767.09,16) width=36.45 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/inline-link-in-composited-iframe-expected.txt b/LayoutTests/interaction-region/inline-link-in-composited-iframe-expected.txt
index a92ccd6bf0c5..d60853b30c7f 100644
--- a/LayoutTests/interaction-region/inline-link-in-composited-iframe-expected.txt
+++ b/LayoutTests/interaction-region/inline-link-in-composited-iframe-expected.txt
@@ -14,7 +14,7 @@ This is a link, outside the frame.
 
       (interaction regions [
         (interaction (-4,-4) width=36.45 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
       (children 1
         (GraphicsLayer
@@ -26,7 +26,7 @@ This is a link, outside the frame.
 
           (interaction regions [
             (interaction (6,6) width=36.45 height=27)
-            (borderRadius 8.00)])
+            (cornerRadius 8.00)])
           )
         )
       )
diff --git a/LayoutTests/interaction-region/inline-link-in-layer-expected.txt b/LayoutTests/interaction-region/inline-link-in-layer-expected.txt
index b4770417444c..b8ff0c34c550 100644
--- a/LayoutTests/interaction-region/inline-link-in-layer-expected.txt
+++ b/LayoutTests/interaction-region/inline-link-in-layer-expected.txt
@@ -14,7 +14,7 @@ This is a link, inside the layer.
 
       (interaction regions [
         (interaction (-4,-4) width=36.45 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
       (children 1
         (GraphicsLayer
@@ -26,7 +26,7 @@ This is a link, inside the layer.
 
           (interaction regions [
             (interaction (-4,-4) width=36.45 height=27)
-            (borderRadius 8.00)])
+            (cornerRadius 8.00)])
           )
         )
       )
diff --git a/LayoutTests/interaction-region/inline-link-in-non-composited-iframe-expected.txt b/LayoutTests/interaction-region/inline-link-in-non-composited-iframe-expected.txt
index a6f6a4248f62..5aef328a3373 100644
--- a/LayoutTests/interaction-region/inline-link-in-non-composited-iframe-expected.txt
+++ b/LayoutTests/interaction-region/inline-link-in-non-composited-iframe-expected.txt
@@ -14,9 +14,9 @@ This is a link, outside the frame.
 
       (interaction regions [
         (interaction (-4,-4) width=36.45 height=27)
-        (borderRadius 8.00),
+        (cornerRadius 8.00),
         (interaction (6,26) width=36.45 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/inline-link-with-pointer-events-none-content-expected.txt b/LayoutTests/interaction-region/inline-link-with-pointer-events-none-content-expected.txt
index c4035ee38d1b..3bc4b26b91f8 100644
--- a/LayoutTests/interaction-region/inline-link-with-pointer-events-none-content-expected.txt
+++ b/LayoutTests/interaction-region/inline-link-with-pointer-events-none-content-expected.txt
@@ -13,7 +13,7 @@ Link Child Disabled Link
 
       (interaction regions [
         (interaction (-4,-4) width=77.78 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/input-type-file-region-expected.txt b/LayoutTests/interaction-region/input-type-file-region-expected.txt
index 702007a9936b..39fcde7a2cc0 100644
--- a/LayoutTests/interaction-region/input-type-file-region-expected.txt
+++ b/LayoutTests/interaction-region/input-type-file-region-expected.txt
@@ -12,10 +12,9 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (guard (1,-8) width=84 height=38)
-        (borderRadius 0.00),
+        (guard (1,-8) width=84 height=38),
         (interaction (1,2) width=84 height=18)
-        (borderRadius 9.00)])
+        (cornerRadius 10.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/input-type-range-region-expected.txt b/LayoutTests/interaction-region/input-type-range-region-expected.txt
index bcd8d046a6c5..565898d9db0f 100644
--- a/LayoutTests/interaction-region/input-type-range-region-expected.txt
+++ b/LayoutTests/interaction-region/input-type-range-region-expected.txt
@@ -12,10 +12,9 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (guard (48.50,-8) width=36 height=36)
-        (borderRadius 0.00),
+        (guard (48.50,-8) width=36 height=36),
         (interaction (58.50,2) width=16 height=16)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/interaction-layers-culling-expected.txt b/LayoutTests/interaction-region/interaction-layers-culling-expected.txt
index ea8bec1378d5..ed91ef6ac23f 100644
--- a/LayoutTests/interaction-region/interaction-layers-culling-expected.txt
+++ b/LayoutTests/interaction-region/interaction-layers-culling-expected.txt
@@ -1,339 +1,78 @@
 
 (CALayer tree root
-  (layer bounds [x: 0 y: 0 width: 800 height: 600])
-  (layer position [x: 400 y: 400])
+  (layer bounds [x: 0 y: 0 width: 800 height: 86050])
+  (layer anchorPoint [x: 0 y: 0])
   (sublayers
     (
-      (layer bounds [x: 0 y: 0 width: 800 height: 600])
-      (layer position [x: 400 y: 400])
+      (layer bounds [x: 0 y: 0 width: 800 height: 86050])
+      (layer anchorPoint [x: 0 y: 0])
       (sublayers
         (
           (layer bounds [x: 0 y: 0 width: 800 height: 86050])
-          (layer anchorPoint [x: 0 y: 0])
+          (layer position [x: 400 y: 400])
           (sublayers
             (
               (layer bounds [x: 0 y: 0 width: 800 height: 86050])
-              (layer anchorPoint [x: 0 y: 0])
+              (layer position [x: 400 y: 400])
               (sublayers
                 (
                   (layer bounds [x: 0 y: 0 width: 800 height: 86050])
-                  (layer position [x: 400 y: 400])
+                  (layer anchorPoint [x: 0 y: 0])
                   (sublayers
                     (
                       (layer bounds [x: 0 y: 0 width: 800 height: 86050])
-                      (layer position [x: 400 y: 400])
+                      (layer anchorPoint [x: 0 y: 0])
                       (sublayers
                         (
-                          (layer bounds [x: 0 y: 0 width: 800 height: 86050])
-                          (layer anchorPoint [x: 0 y: 0])
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
                           (sublayers
                             (
-                              (layer bounds [x: 0 y: 0 width: 800 height: 86050])
-                              (layer anchorPoint [x: 0 y: 0])
-                              (sublayers
-                                (
-                                  (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                  (sublayers
-                                    (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 512])
-                                      (layer anchorPoint [x: 0 y: 0]))
-                                    (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 512])
-                                      (layer position [x: 0 y: 0])
-                                      (layer anchorPoint [x: 0 y: 0]))))
-                                (
-                                  (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                  (layer anchorPoint [x: 0 y: 0]))
-                                (
-                                  (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                  (sublayers
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                      (layer position [x: 400 y: 400])
-                                      (layer cornerRadius 8))))))))))))))
-            (
-              (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
-        (
-          (layer bounds [x: 0 y: 0 width: 0 height: 0])
-          (layer anchorPoint [x: 0 y: 0]))
-        (
-          (layer bounds [x: 0 y: 0 width: 800 height: 12])
-          (layer position [x: 400 y: 400])
-          (layer zPosition 1000)
-          (layer opacity 0)
-          (sublayers
-            (
-              (layer bounds [x: 0 y: 0 width: 116 height: 32])
-              (layer position [x: 400 y: 400]))
-            (
-              (layer bounds [x: 0 y: 0 width: 800 height: 12])
-              (layer position [x: 400 y: 400])
-              (sublayers
-                (
-                  (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                  (layer position [x: 400 y: 400])
-                  (layer cornerRadius 6)
-                  (sublayers
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 5.999999999999995 height: 90])
-                      (layer position [x: 48 y: 48])
-                      (layer opacity 0)
-                      (sublayers
-                        (
-                          (layer bounds [x: 0 y: 0 width: 5.999999999999995 height: 90])
-                          (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                          (layer opacity 0.15)
-                          (sublayers
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
+                              (layer bounds [x: 0 y: 0 width: 800 height: 512])
+                              (layer anchorPoint [x: 0 y: 0]))
                             (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))))))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 90 height: 6])
-                      (layer position [x: 48 y: 48])
-                      (layer opacity 0.15)
-                      (layer cornerRadius 3))))))))
-        (
-          (layer bounds [x: 0 y: 0 width: 12 height: 600])
-          (layer position [x: 791 y: 791])
-          (layer zPosition 1000)
-          (layer opacity 0)
-          (sublayers
-            (
-              (layer bounds [x: 0 y: 0 width: 32 height: 116])
-              (layer position [x: 6 y: 6]))
-            (
-              (layer bounds [x: 0 y: 0 width: 12 height: 600])
-              (layer position [x: 6 y: 6])
-              (sublayers
-                (
-                  (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                  (layer position [x: 6 y: 6])
-                  (layer cornerRadius 6)
-                  (sublayers
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                      (layer position [x: 6 y: 6])
-                      (layer opacity 0)
-                      (sublayers
+                              (layer bounds [x: 0 y: 0 width: 800 height: 512])
+                              (layer position [x: 0 y: 0])
+                              (layer anchorPoint [x: 0 y: 0]))))
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (layer anchorPoint [x: 0 y: 0]))
                         (
-                          (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                          (layer position [x: 3 y: 3])
-                          (layer opacity 0.15)
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
                           (sublayers
                             (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))))))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 6 height: 28])
-                      (layer position [x: 6 y: 6])
-                      (layer opacity 0.15)
-                      (layer cornerRadius 3))))))))))))
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                              (layer position [x: 400 y: 400])
+                              (layer cornerRadius 8))))))))))))))
+    (
+      (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
diff --git a/LayoutTests/interaction-region/interaction-layers-culling-layer-type-change-expected.txt b/LayoutTests/interaction-region/interaction-layers-culling-layer-type-change-expected.txt
index 97acef39010d..7c663fa86f47 100644
--- a/LayoutTests/interaction-region/interaction-layers-culling-layer-type-change-expected.txt
+++ b/LayoutTests/interaction-region/interaction-layers-culling-layer-type-change-expected.txt
@@ -1,324 +1,63 @@
 
 (CALayer tree root
-  (layer bounds [x: 0 y: 0 width: 800 height: 600])
-  (layer position [x: 400 y: 400])
+  (layer bounds [x: 0 y: 0 width: 800 height: 713])
+  (layer anchorPoint [x: 0 y: 0])
   (sublayers
     (
-      (layer bounds [x: 0 y: 0 width: 800 height: 600])
-      (layer position [x: 400 y: 400])
+      (layer bounds [x: 0 y: 0 width: 800 height: 713])
+      (layer anchorPoint [x: 0 y: 0])
       (sublayers
         (
           (layer bounds [x: 0 y: 0 width: 800 height: 713])
-          (layer anchorPoint [x: 0 y: 0])
+          (layer position [x: 400 y: 400])
           (sublayers
             (
               (layer bounds [x: 0 y: 0 width: 800 height: 713])
-              (layer anchorPoint [x: 0 y: 0])
+              (layer position [x: 400 y: 400])
               (sublayers
                 (
                   (layer bounds [x: 0 y: 0 width: 800 height: 713])
-                  (layer position [x: 400 y: 400])
+                  (layer anchorPoint [x: 0 y: 0])
                   (sublayers
                     (
                       (layer bounds [x: 0 y: 0 width: 800 height: 713])
-                      (layer position [x: 400 y: 400])
+                      (layer anchorPoint [x: 0 y: 0])
                       (sublayers
                         (
-                          (layer bounds [x: 0 y: 0 width: 800 height: 713])
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (sublayers
+                            (
+                              (layer bounds [x: 0 y: 0 width: 800 height: 512])
+                              (layer anchorPoint [x: 0 y: 0]))
+                            (
+                              (layer bounds [x: 0 y: 0 width: 800 height: 201])
+                              (layer position [x: 0 y: 0])
+                              (layer anchorPoint [x: 0 y: 0]))))
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
                           (layer anchorPoint [x: 0 y: 0])
                           (sublayers
                             (
-                              (layer bounds [x: 0 y: 0 width: 800 height: 713])
-                              (layer anchorPoint [x: 0 y: 0])
+                              (layer bounds [x: 0 y: 0 width: 800 height: 700])
+                              (layer position [x: 400 y: 400])
                               (sublayers
                                 (
                                   (layer bounds [x: 0 y: 0 width: 0 height: 0])
                                   (sublayers
                                     (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 512])
-                                      (layer anchorPoint [x: 0 y: 0]))
+                                      (type 0)
+                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                                      (layer position [x: 400 y: 400])
+                                      (layer cornerRadius 8))
                                     (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 201])
-                                      (layer position [x: 0 y: 0])
-                                      (layer anchorPoint [x: 0 y: 0]))))
-                                (
-                                  (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                  (layer anchorPoint [x: 0 y: 0])
-                                  (sublayers
+                                      (type 0)
+                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
+                                      (layer position [x: 400 y: 400])
+                                      (layer cornerRadius 8))
                                     (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 700])
+                                      (type 0)
+                                      (layer bounds [x: 0 y: 0 width: 700 height: 36])
                                       (layer position [x: 400 y: 400])
-                                      (sublayers
-                                        (
-                                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                          (sublayers
-                                            (
-                                              (type 0)
-                                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                              (layer position [x: 400 y: 400])
-                                              (layer cornerRadius 8))
-                                            (
-                                              (type 0)
-                                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                              (layer position [x: 400 y: 400])
-                                              (layer cornerRadius 8))
-                                            (
-                                              (type 0)
-                                              (layer bounds [x: 0 y: 0 width: 700 height: 36])
-                                              (layer position [x: 400 y: 400])
-                                              (layer cornerRadius 8))))))))))))))))))
-            (
-              (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
-        (
-          (layer bounds [x: 0 y: 0 width: 0 height: 0])
-          (layer anchorPoint [x: 0 y: 0]))
-        (
-          (layer bounds [x: 0 y: 0 width: 800 height: 12])
-          (layer position [x: 400 y: 400])
-          (layer zPosition 1000)
-          (layer opacity 0)
-          (sublayers
-            (
-              (layer bounds [x: 0 y: 0 width: 116 height: 32])
-              (layer position [x: 400 y: 400]))
-            (
-              (layer bounds [x: 0 y: 0 width: 800 height: 12])
-              (layer position [x: 400 y: 400])
-              (sublayers
-                (
-                  (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                  (layer position [x: 400 y: 400])
-                  (layer cornerRadius 6)
-                  (sublayers
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 5.999999999999995 height: 90])
-                      (layer position [x: 48 y: 48])
-                      (layer opacity 0)
-                      (sublayers
-                        (
-                          (layer bounds [x: 0 y: 0 width: 5.999999999999995 height: 90])
-                          (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                          (layer opacity 0.15)
-                          (sublayers
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))))))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 90 height: 6])
-                      (layer position [x: 48 y: 48])
-                      (layer opacity 0.15)
-                      (layer cornerRadius 3))))))))
-        (
-          (layer bounds [x: 0 y: 0 width: 12 height: 600])
-          (layer position [x: 791 y: 791])
-          (layer zPosition 1000)
-          (layer opacity 0)
-          (sublayers
-            (
-              (layer bounds [x: 0 y: 0 width: 32 height: 116])
-              (layer position [x: 6 y: 6]))
-            (
-              (layer bounds [x: 0 y: 0 width: 12 height: 600])
-              (layer position [x: 6 y: 6])
-              (sublayers
-                (
-                  (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                  (layer position [x: 6 y: 6])
-                  (layer cornerRadius 6)
-                  (sublayers
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                      (layer position [x: 6 y: 6])
-                      (layer opacity 0)
-                      (sublayers
-                        (
-                          (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                          (layer position [x: 3 y: 3])
-                          (layer opacity 0.15)
-                          (sublayers
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))))))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 6 height: 75.5])
-                      (layer position [x: 6 y: 6])
-                      (layer opacity 0.15)
-                      (layer cornerRadius 3))))))))))))
+                                      (layer cornerRadius 8))))))))))))))))))
+    (
+      (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
diff --git a/LayoutTests/interaction-region/interaction-region-size-limit-expected.txt b/LayoutTests/interaction-region/interaction-region-size-limit-expected.txt
index 8f59fd7ecb76..c8e3ea2e6023 100644
--- a/LayoutTests/interaction-region/interaction-region-size-limit-expected.txt
+++ b/LayoutTests/interaction-region/interaction-region-size-limit-expected.txt
@@ -11,10 +11,8 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (0,0) width=395 height=295)
-        (borderRadius 0.00),
-        (interaction (0,305) width=395 height=295)
-        (borderRadius 0.00)])
+        (interaction (0,0) width=395 height=295),
+        (interaction (0,305) width=395 height=295)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/labels-expected.txt b/LayoutTests/interaction-region/labels-expected.txt
index a0918c65d850..5a305a18413f 100644
--- a/LayoutTests/interaction-region/labels-expected.txt
+++ b/LayoutTests/interaction-region/labels-expected.txt
@@ -15,12 +15,11 @@ Disabled input
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (guard (273,13) width=36 height=36)
-        (borderRadius 0.00),
+        (guard (273,13) width=36 height=36),
         (interaction (283,23) width=16 height=16)
-        (borderRadius 5.00),
+        (cornerRadius 5.00),
         (interaction (30,52) width=260 height=42)
-        (borderRadius 16.00)])
+        (cornerRadius 16.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/layer-tree-expected.txt b/LayoutTests/interaction-region/layer-tree-expected.txt
index c84730440201..d8354bed6a98 100644
--- a/LayoutTests/interaction-region/layer-tree-expected.txt
+++ b/LayoutTests/interaction-region/layer-tree-expected.txt
@@ -1,362 +1,122 @@
 
 (CALayer tree root
   (layer bounds [x: 0 y: 0 width: 800 height: 600])
-  (layer position [x: 400 y: 400])
+  (layer anchorPoint [x: 0 y: 0])
   (sublayers
     (
       (layer bounds [x: 0 y: 0 width: 800 height: 600])
-      (layer position [x: 400 y: 400])
+      (layer anchorPoint [x: 0 y: 0])
       (sublayers
         (
           (layer bounds [x: 0 y: 0 width: 800 height: 600])
-          (layer anchorPoint [x: 0 y: 0])
+          (layer position [x: 400 y: 400])
           (sublayers
             (
               (layer bounds [x: 0 y: 0 width: 800 height: 600])
-              (layer anchorPoint [x: 0 y: 0])
+              (layer position [x: 400 y: 400])
               (sublayers
                 (
                   (layer bounds [x: 0 y: 0 width: 800 height: 600])
-                  (layer position [x: 400 y: 400])
+                  (layer anchorPoint [x: 0 y: 0])
                   (sublayers
                     (
                       (layer bounds [x: 0 y: 0 width: 800 height: 600])
-                      (layer position [x: 400 y: 400])
+                      (layer anchorPoint [x: 0 y: 0])
                       (sublayers
                         (
-                          (layer bounds [x: 0 y: 0 width: 800 height: 600])
-                          (layer anchorPoint [x: 0 y: 0])
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
                           (sublayers
                             (
                               (layer bounds [x: 0 y: 0 width: 800 height: 600])
-                              (layer anchorPoint [x: 0 y: 0])
+                              (layer anchorPoint [x: 0 y: 0]))))
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (sublayers
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 58.5 height: 20])
+                              (layer position [x: 29.25 y: 29.25])
+                              (layer cornerRadius 10))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 284 height: 192])
+                              (layer position [x: 152 y: 152])
+                              (layer cornerRadius 8))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 200 height: 100])
+                              (layer position [x: 100 y: 100]))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 50 y: 50]))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 150 y: 150])
+                              (layer cornerRadius 16))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 250 y: 250])
+                              (layer cornerRadius 14)
+                              (layer masked corners 5))
+                            (
+                              (type 0)
+                              (mask
+                                (frame [x: 0 y: 0 width: 100 height: 100]))
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 350 y: 350]))))
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (layer anchorPoint [x: 0 y: 0])
+                          (sublayers
+                            (
+                              (layer bounds [x: 0 y: 0 width: 200 height: 200])
+                              (layer position [x: 100 y: 100])
+                              (layer opacity 0)
                               (sublayers
                                 (
                                   (layer bounds [x: 0 y: 0 width: 0 height: 0])
                                   (sublayers
                                     (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 600])
-                                      (layer anchorPoint [x: 0 y: 0]))))
+                                      (type 0)
+                                      (layer bounds [x: 0 y: 0 width: 75.9921875 height: 27])
+                                      (layer position [x: 33.99609375 y: 33.99609375])
+                                      (layer cornerRadius 8))))))
+                            (
+                              (layer bounds [x: 0 y: 0 width: 800 height: 600])
+                              (layer position [x: 400 y: 400])
+                              (layer opacity 0.8)
+                              (sublayers
+                                (
+                                  (layer bounds [x: 0 y: 0 width: 800 height: 20])
+                                  (layer position [x: 400 y: 400]))
                                 (
                                   (layer bounds [x: 0 y: 0 width: 0 height: 0])
                                   (sublayers
                                     (
                                       (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 58.5 height: 20])
-                                      (layer position [x: 29.25 y: 29.25])
-                                      (layer cornerRadius 9))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 284 height: 192])
-                                      (layer position [x: 152 y: 152])
-                                      (layer cornerRadius 8))
-                                    (
-                                      (type 0)
-                                      (layer bounds [x: 0 y: 0 width: 200 height: 100])
-                                      (layer position [x: 100 y: 100]))))
+                                      (layer bounds [x: 0 y: 0 width: 32.890625 height: 27])
+                                      (layer position [x: 12.4453125 y: 12.4453125])
+                                      (layer cornerRadius 8))))
                                 (
-                                  (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                  (layer anchorPoint [x: 0 y: 0])
+                                  (layer bounds [x: 0 y: 0 width: 800 height: 40])
+                                  (layer position [x: 400 y: 400])
                                   (sublayers
                                     (
-                                      (layer bounds [x: 0 y: 0 width: 200 height: 200])
-                                      (layer position [x: 100 y: 100])
-                                      (layer opacity 0)
-                                      (sublayers
-                                        (
-                                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                          (sublayers
-                                            (
-                                              (type 0)
-                                              (layer bounds [x: 0 y: 0 width: 75.9921875 height: 27])
-                                              (layer position [x: 33.99609375 y: 33.99609375])
-                                              (layer cornerRadius 8))))))
+                                      (layer bounds [x: 0 y: 0 width: 800 height: 20])
+                                      (layer position [x: 400 y: 400]))
                                     (
-                                      (layer bounds [x: 0 y: 0 width: 800 height: 600])
-                                      (layer position [x: 400 y: 400])
-                                      (layer opacity 0.8)
+                                      (layer bounds [x: 0 y: 0 width: 0 height: 0])
                                       (sublayers
                                         (
-                                          (layer bounds [x: 0 y: 0 width: 800 height: 20])
-                                          (layer position [x: 400 y: 400]))
-                                        (
-                                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                          (sublayers
-                                            (
-                                              (type 0)
-                                              (layer bounds [x: 0 y: 0 width: 32.890625 height: 27])
-                                              (layer position [x: 12.4453125 y: 12.4453125])
-                                              (layer cornerRadius 8))))
-                                        (
-                                          (layer bounds [x: 0 y: 0 width: 800 height: 40])
-                                          (layer position [x: 400 y: 400])
-                                          (sublayers
-                                            (
-                                              (layer bounds [x: 0 y: 0 width: 800 height: 20])
-                                              (layer position [x: 400 y: 400]))
-                                            (
-                                              (layer bounds [x: 0 y: 0 width: 0 height: 0])
-                                              (sublayers
-                                                (
-                                                  (type 0)
-                                                  (layer bounds [x: 0 y: 0 width: 115.0859375 height: 27])
-                                                  (layer position [x: 155.71484375 y: 155.71484375])
-                                                  (layer cornerRadius 8))))))
-                                        (
-                                          (layer bounds [x: 0 y: 0 width: 800 height: 20])
-                                          (layer position [x: 400 y: 400]))))))))))))))))
-            (
-              (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
-        (
-          (layer bounds [x: 0 y: 0 width: 0 height: 0])
-          (layer anchorPoint [x: 0 y: 0]))
-        (
-          (layer bounds [x: 0 y: 0 width: 800 height: 12])
-          (layer position [x: 400 y: 400])
-          (layer zPosition 1000)
-          (layer opacity 0)
-          (sublayers
-            (
-              (layer bounds [x: 0 y: 0 width: 116 height: 32])
-              (layer position [x: 400 y: 400]))
-            (
-              (layer bounds [x: 0 y: 0 width: 800 height: 12])
-              (layer position [x: 400 y: 400])
-              (sublayers
-                (
-                  (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                  (layer position [x: 400 y: 400])
-                  (layer cornerRadius 6)
-                  (sublayers
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 96 height: 12])
-                      (layer position [x: 48 y: 48])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 5.999999999999995 height: 90])
-                      (layer position [x: 48 y: 48])
-                      (layer opacity 0)
-                      (sublayers
-                        (
-                          (layer bounds [x: 0 y: 0 width: 5.999999999999995 height: 90])
-                          (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                          (layer opacity 0.15)
-                          (sublayers
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 2.9999999999999973 y: 2.9999999999999973])
-                              (layer cornerRadius 1))))))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 90 height: 6])
-                      (layer position [x: 48 y: 48])
-                      (layer opacity 0.15)
-                      (layer cornerRadius 3))))))))
-        (
-          (layer bounds [x: 0 y: 0 width: 12 height: 600])
-          (layer position [x: 791 y: 791])
-          (layer zPosition 1000)
-          (layer opacity 0)
-          (sublayers
-            (
-              (layer bounds [x: 0 y: 0 width: 32 height: 116])
-              (layer position [x: 6 y: 6]))
-            (
-              (layer bounds [x: 0 y: 0 width: 12 height: 600])
-              (layer position [x: 6 y: 6])
-              (sublayers
-                (
-                  (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                  (layer position [x: 6 y: 6])
-                  (layer cornerRadius 6)
-                  (sublayers
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 12 height: 96])
-                      (layer position [x: 6 y: 6])
-                      (layer cornerRadius 6))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                      (layer position [x: 6 y: 6])
-                      (layer opacity 0)
-                      (sublayers
-                        (
-                          (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                          (layer position [x: 3 y: 3])
-                          (layer opacity 0.15)
-                          (sublayers
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))
-                            (
-                              (layer bounds [x: 0 y: 0 width: 4 height: 2])
-                              (layer position [x: 3 y: 3])
-                              (layer cornerRadius 1))))))
-                    (
-                      (layer bounds [x: 0 y: 0 width: 6 height: 90])
-                      (layer position [x: 6 y: 6])
-                      (layer opacity 0.15)
-                      (layer cornerRadius 3))))))))))))
+                                          (type 0)
+                                          (layer bounds [x: 0 y: 0 width: 115.0859375 height: 27])
+                                          (layer position [x: 155.71484375 y: 155.71484375])
+                                          (layer cornerRadius 8))))))
+                                (
+                                  (layer bounds [x: 0 y: 0 width: 800 height: 20])
+                                  (layer position [x: 400 y: 400]))))))))))))))))
+    (
+      (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
diff --git a/LayoutTests/interaction-region/layer-tree-shape-reset-expected.txt b/LayoutTests/interaction-region/layer-tree-shape-reset-expected.txt
new file mode 100644
index 000000000000..f801ab5efdc1
--- /dev/null
+++ b/LayoutTests/interaction-region/layer-tree-shape-reset-expected.txt
@@ -0,0 +1,55 @@
+
+(CALayer tree root
+  (layer bounds [x: 0 y: 0 width: 800 height: 600])
+  (layer anchorPoint [x: 0 y: 0])
+  (sublayers
+    (
+      (layer bounds [x: 0 y: 0 width: 800 height: 600])
+      (layer anchorPoint [x: 0 y: 0])
+      (sublayers
+        (
+          (layer bounds [x: 0 y: 0 width: 800 height: 600])
+          (layer position [x: 400 y: 400])
+          (sublayers
+            (
+              (layer bounds [x: 0 y: 0 width: 800 height: 600])
+              (layer position [x: 400 y: 400])
+              (sublayers
+                (
+                  (layer bounds [x: 0 y: 0 width: 800 height: 600])
+                  (layer anchorPoint [x: 0 y: 0])
+                  (sublayers
+                    (
+                      (layer bounds [x: 0 y: 0 width: 800 height: 600])
+                      (layer anchorPoint [x: 0 y: 0])
+                      (sublayers
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (sublayers
+                            (
+                              (layer bounds [x: 0 y: 0 width: 800 height: 600])
+                              (layer anchorPoint [x: 0 y: 0]))))
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (layer anchorPoint [x: 0 y: 0]))
+                        (
+                          (layer bounds [x: 0 y: 0 width: 0 height: 0])
+                          (sublayers
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 50 y: 50]))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 150 y: 150]))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 250 y: 250]))
+                            (
+                              (type 0)
+                              (layer bounds [x: 0 y: 0 width: 100 height: 100])
+                              (layer position [x: 350 y: 350]))))))))))))))
+    (
+      (layer bounds [x: 0 y: 0 width: 0 height: 0]))))
diff --git a/LayoutTests/interaction-region/layer-tree-shape-reset.html b/LayoutTests/interaction-region/layer-tree-shape-reset.html
new file mode 100644
index 000000000000..05d33c059e20
--- /dev/null
+++ b/LayoutTests/interaction-region/layer-tree-shape-reset.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>
+<html>
+<style>
+    body { margin: 0; }
+    .shape {
+        float: left;
+        background: blue;
+        width: 100px;
+        height: 100px;
+        cursor: pointer;
+    }
+    #radius {
+        border-radius: 16px;
+    }
+    #partial-radius {
+        border-radius: 0px 14px 0px 14px;
+    }
+    #non-uniform-radius {
+        border-radius: 10px 11px 12px 13px;
+    }
+
+</style>
+<script src="../resources/ui-helper.js"></script>
+<body>
+<section id="test">
+    <div id="noradius" class="shape">
+    </div>
+    <div id="radius" class="shape">
+    </div>
+    <div id="partial-radius" class="shape">
+    </div>
+    <div id="non-uniform-radius" class="shape">
+    </div>
+</div>
+
+</section>
+
+<pre id="results"></pre>
+<script>
+document.body.addEventListener("click", function(e) {
+    console.log(e, "event delegation");
+});
+
+if (window.testRunner) {
+    testRunner.waitUntilDone();
+    testRunner.dumpAsText();
+}
+
+window.onload = async function () {
+    if (!window.internals)
+        return;
+
+    await UIHelper.animationFrame();
+    await UIHelper.ensureStablePresentationUpdate();
+
+    Array.from(document.querySelectorAll(".shape"))
+        .forEach(el => el.style.borderRadius = 0 );
+
+    await UIHelper.animationFrame();
+    await UIHelper.ensureStablePresentationUpdate();
+
+    results.textContent = await UIHelper.getCALayerTree();
+    document.getElementById('test').remove();
+
+    testRunner.notifyDone();
+};
+</script>
+</body>
+</html>
+
diff --git a/LayoutTests/interaction-region/layer-tree.html b/LayoutTests/interaction-region/layer-tree.html
index 9d1513b7912b..d19f2f7ce06c 100644
--- a/LayoutTests/interaction-region/layer-tree.html
+++ b/LayoutTests/interaction-region/layer-tree.html
@@ -35,6 +35,22 @@
         height: 100px;
         cursor: pointer;
     }
+    .shape {
+        float: left;
+        background: blue;
+        width: 100px;
+        height: 100px;
+        cursor: pointer;
+    }
+    #radius {
+        border-radius: 16px;
+    }
+    #partial-radius {
+        border-radius: 14px 0 0 14px;
+    }
+    #non-uniform-radius {
+        border-radius: 10px 11px 12px 13px;
+    }
 
 </style>
 <script src="../resources/ui-helper.js"></script>
@@ -61,6 +77,14 @@
     <div id="faded">
         <a href="#">Faded link</a>
     </div>
+    <div id="noradius" class="shape">
+    </div>
+    <div id="radius" class="shape">
+    </div>
+    <div id="partial-radius" class="shape">
+    </div>
+    <div id="non-uniform-radius" class="shape">
+    </div>
     <div id="resized" onclick="click()">
         will be resized
     </div>
@@ -70,6 +94,10 @@
 
 <pre id="results"></pre>
 <script>
+document.body.addEventListener("click", function(e) {
+    console.log(e, "event delegation");
+});
+
 if (window.testRunner) {
     testRunner.waitUntilDone();
     testRunner.dumpAsText();
diff --git a/LayoutTests/interaction-region/nested-composited-text-painter-expected.txt b/LayoutTests/interaction-region/nested-composited-text-painter-expected.txt
index 523c5bb4493d..a70b3dc453c5 100644
--- a/LayoutTests/interaction-region/nested-composited-text-painter-expected.txt
+++ b/LayoutTests/interaction-region/nested-composited-text-painter-expected.txt
@@ -12,7 +12,7 @@
 
       (interaction regions [
         (interaction (0,0) width=100 height=100)
-        (borderRadius 10.00)])
+        (cornerRadius 10.00)])
       )
       (children 1
         (GraphicsLayer
diff --git a/LayoutTests/interaction-region/overlap-expected.txt b/LayoutTests/interaction-region/overlap-expected.txt
index 5edf51973f47..21d5adf35f4d 100644
--- a/LayoutTests/interaction-region/overlap-expected.txt
+++ b/LayoutTests/interaction-region/overlap-expected.txt
@@ -11,10 +11,8 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (occlusion (0,0) width=200 height=100)
-        (borderRadius 0.00),
-        (interaction (0,0) width=200 height=100)
-        (borderRadius 0.00)])
+        (occlusion (0,0) width=200 height=100),
+        (interaction (0,0) width=200 height=100)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/overlap-same-group-expected.txt b/LayoutTests/interaction-region/overlap-same-group-expected.txt
index c8ac243fc27c..d7ad3403511e 100644
--- a/LayoutTests/interaction-region/overlap-same-group-expected.txt
+++ b/LayoutTests/interaction-region/overlap-same-group-expected.txt
@@ -11,12 +11,8 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (50,0) width=150 height=100)
-        (borderRadius 12 12 0 12),
-        (interaction (200,25) width=50 height=75)
-        (borderRadius 0 12 0 0),
-        (interaction (100,100) width=150 height=25)
-        (borderRadius 0 0 12 12)])
+        (interaction (50,0) width=200 height=125)
+        (clipPath move to (0,12), add line to (0,12), add curve to (0,5.37) (5.37,0) (12,0), add line to (138,0), add line to (138,0), add curve to (144.63,0) (150,5.37) (150,12), add line to (150,13), add line to (150,13), add curve to (150,19.63) (155.37,25) (162,25), add line to (188,25), add line to (188,25), add curve to (194.63,25) (200,30.37) (200,37), add line to (200,113), add line to (200,113), add curve to (200,119.63) (194.63,125) (188,125), add line to (62,125), add line to (62,125), add curve to (55.37,125) (50,119.63) (50,113), add line to (50,112), add line to (50,112), add curve to (50,105.37) (44.63,100) (38,100), add line to (12,100), add line to (12,100), add curve to (5.37,100) (0,94.63) (0,88), close subpath)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/overlay-expected.txt b/LayoutTests/interaction-region/overlay-expected.txt
index 0f5161c7f1c6..77f4f5227820 100644
--- a/LayoutTests/interaction-region/overlay-expected.txt
+++ b/LayoutTests/interaction-region/overlay-expected.txt
@@ -11,10 +11,8 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (occlusion (0,0) width=200 height=100)
-        (borderRadius 0.00),
-        (occlusion (0,200) width=200 height=100)
-        (borderRadius 0.00)])
+        (occlusion (0,0) width=200 height=100),
+        (occlusion (0,200) width=200 height=100)])
       )
       (children 3
         (GraphicsLayer
diff --git a/LayoutTests/interaction-region/paused-video-regions-expected.txt b/LayoutTests/interaction-region/paused-video-regions-expected.txt
index 274fd0fbecb7..f17a72c087ed 100644
--- a/LayoutTests/interaction-region/paused-video-regions-expected.txt
+++ b/LayoutTests/interaction-region/paused-video-regions-expected.txt
@@ -35,7 +35,7 @@
 
                   (interaction regions [
                     (interaction (0,0) width=51 height=51)
-                    (borderRadius 25.50)])
+                    (cornerRadius 25.50)])
                   )
                   (children 1
                     (GraphicsLayer
diff --git a/LayoutTests/interaction-region/position-only-update-expected.txt b/LayoutTests/interaction-region/position-only-update-expected.txt
index ed28ef6adbec..cf76e1925065 100644
--- a/LayoutTests/interaction-region/position-only-update-expected.txt
+++ b/LayoutTests/interaction-region/position-only-update-expected.txt
@@ -14,7 +14,7 @@ compositing
 
       (interaction regions [
         (interaction (107.98,76) width=81.77 height=27)
-        (borderRadius 8.00)])
+        (cornerRadius 8.00)])
       )
       (children 2
         (GraphicsLayer
diff --git a/LayoutTests/interaction-region/pseudo-element-expected.txt b/LayoutTests/interaction-region/pseudo-element-expected.txt
index 16bef2d8a36e..1b038120318b 100644
--- a/LayoutTests/interaction-region/pseudo-element-expected.txt
+++ b/LayoutTests/interaction-region/pseudo-element-expected.txt
@@ -12,7 +12,7 @@
 
       (interaction regions [
         (interaction (0,0) width=100 height=100)
-        (borderRadius 10.00)])
+        (cornerRadius 10.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/split-inline-link-expected.txt b/LayoutTests/interaction-region/split-inline-link-expected.txt
index 9484f8ba5f3c..b1cbf4b5cd8b 100644
--- a/LayoutTests/interaction-region/split-inline-link-expected.txt
+++ b/LayoutTests/interaction-region/split-inline-link-expected.txt
@@ -13,10 +13,8 @@ short second line.
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (197.27,-4) width=31.99 height=27)
-        (borderRadius 8.00),
-        (interaction (-4,16) width=117 height=27)
-        (borderRadius 8.00)])
+        (interaction (-4,-4) width=233.27 height=47)
+        (clipPath move to (201.27,8), add line to (201.27,8), add curve to (201.27,3.58) (204.86,0) (209.27,0), add line to (225.27,0), add line to (225.27,0), add curve to (229.68,0) (233.27,3.58) (233.27,8), add line to (233.27,19), add line to (233.27,19), add curve to (233.27,23.42) (229.68,27) (225.27,27), add line to (209.27,27), add line to (209.27,27), add curve to (204.86,27) (201.27,23.42) (201.27,19), close subpath, move to (0,28), add line to (0,28), add curve to (0,23.58) (3.58,20) (8,20), add line to (108.42,20), add line to (108.42,20), add curve to (112.84,20) (116.42,23.58) (116.42,28), add line to (116.42,39), add line to (116.42,39), add curve to (116.42,43.42) (112.84,47) (108.42,47), add line to (8,47), add line to (8,47), add curve to (3.58,47) (0,43.42) (0,39), close subpath)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/text-controls-expected.txt b/LayoutTests/interaction-region/text-controls-expected.txt
index 86d8d004a39a..b40509c32211 100644
--- a/LayoutTests/interaction-region/text-controls-expected.txt
+++ b/LayoutTests/interaction-region/text-controls-expected.txt
@@ -13,9 +13,9 @@
 
       (interaction regions [
         (interaction (9,9) width=211 height=204)
-        (borderRadius 5.00),
+        (cornerRadius 5.00),
         (interaction (226,178) width=330 height=55)
-        (borderRadius 5.00)])
+        (cornerRadius 5.00)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/text-input-expected.txt b/LayoutTests/interaction-region/text-input-expected.txt
index bb5d8d0518f3..322a1f81d7bd 100644
--- a/LayoutTests/interaction-region/text-input-expected.txt
+++ b/LayoutTests/interaction-region/text-input-expected.txt
@@ -13,17 +13,14 @@
 
       (interaction regions [
         (interaction (161,126) width=98 height=38)
-        (borderRadius 5.00),
+        (cornerRadius 5.00),
         (interaction (344,120) width=110 height=50)
-        (borderRadius 5.00),
+        (cornerRadius 5.00),
         (interaction (160,250) width=110 height=50)
-        (borderRadius 5.00),
-        (interaction (161,381) width=98 height=38)
-        (borderRadius 0.00),
-        (interaction (161,461) width=110 height=50)
-        (borderRadius 0.00),
-        (interaction (161,553) width=110 height=50)
-        (borderRadius 0.00)])
+        (cornerRadius 5.00),
+        (interaction (161,381) width=98 height=38),
+        (interaction (161,461) width=110 height=50),
+        (interaction (161,553) width=110 height=50)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/tiny-regions-expected.txt b/LayoutTests/interaction-region/tiny-regions-expected.txt
index 40f07670c430..46c756667d56 100644
--- a/LayoutTests/interaction-region/tiny-regions-expected.txt
+++ b/LayoutTests/interaction-region/tiny-regions-expected.txt
@@ -11,12 +11,9 @@
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (guard (-10,0) width=30 height=30)
-        (borderRadius 0.00),
-        (interaction (0,10) width=10 height=10)
-        (borderRadius 0.00),
-        (occlusion (0,20) width=10 height=10)
-        (borderRadius 0.00)])
+        (guard (-10,0) width=30 height=30),
+        (interaction (0,10) width=10 height=10),
+        (occlusion (0,20) width=10 height=10)])
       )
     )
   )
diff --git a/LayoutTests/interaction-region/wrapped-inline-link-expected.txt b/LayoutTests/interaction-region/wrapped-inline-link-expected.txt
index 1ac776113650..c0d596262de9 100644
--- a/LayoutTests/interaction-region/wrapped-inline-link-expected.txt
+++ b/LayoutTests/interaction-region/wrapped-inline-link-expected.txt
@@ -19,24 +19,10 @@ Line
         (rect (0,0) width=800 height=600)
 
       (interaction regions [
-        (interaction (-4,-4) width=37.32 height=27)
-        (borderRadius 8 8 0 0),
-        (interaction (-4,23) width=38 height=20)
-        (borderRadius 0.00),
-        (interaction (-4,43) width=38 height=20)
-        (borderRadius 0.00),
-        (interaction (-4,63) width=38 height=20)
-        (borderRadius 0 0 8 8),
-        (interaction (6,82) width=65.34 height=27)
-        (borderRadius 8 8 0 0),
-        (interaction (72,94) width=41 height=15)
-        (borderRadius 0 8 0 0),
-        (interaction (6,109) width=107 height=12)
-        (borderRadius 0 0 8 0),
-        (interaction (6,121) width=71 height=12)
-        (borderRadius 0 0 8 0),
-        (interaction (6,133) width=38 height=12)
-        (borderRadius 0 0 8 8)])
+        (interaction (-4,-4) width=37.32 height=87)
+        (clipPath move to (0,8), add line to (0,8), add curve to (0,3.58) (3.58,0) (8,0), add line to (29.32,0), add line to (29.32,0), add curve to (33.74,0) (37.32,3.58) (37.32,8), add line to (37.32,16.50), add line to (37.32,20), add line to (37.32,23.50), add line to (37.32,27), add line to (37.32,36.50), add line to (37.32,40), add line to (37.32,43.50), add line to (37.32,47), add line to (37.32,56.50), add line to (37.32,60), add line to (37.32,63.50), add line to (37.32,67), add line to (37.32,79), add line to (37.32,79), add curve to (37.32,83.42) (33.74,87) (29.32,87), add line to (8,87), add line to (8,87), add curve to (3.58,87) (0,83.42) (0,79), add line to (0,70.50), add line to (0,67), add line to (0,63.50), add line to (0,60), add line to (0,50.50), add line to (0,47), add line to (0,43.50), add line to (0,40), add line to (0,30.50), add line to (0,27), add line to (0,23.50), add line to (0,20), close subpath),
+        (interaction (6,82) width=106.20 height=63)
+        (clipPath move to (0,6), add line to (0,6), add curve to (0,2.69) (2.69,0) (6,0), add line to (59.34,0), add line to (59.34,0), add curve to (62.65,0) (65.34,2.69) (65.34,6), add line to (65.34,6), add line to (65.34,6), add curve to (65.34,9.31) (68.02,12) (71.34,12), add line to (98.20,12), add line to (98.20,12), add curve to (102.61,12) (106.20,15.58) (106.20,20), add line to (106.20,31), add line to (106.20,31), add curve to (106.20,35.42) (102.61,39) (98.20,39), add line to (76.66,39), add line to (76.66,39), add curve to (73.35,39) (70.66,41.69) (70.66,45), add line to (70.66,45), add line to (70.66,45), add curve to (70.66,48.31) (67.98,51) (64.66,51), add line to (43.32,51), add line to (43.32,51), add curve to (40.01,51) (37.32,53.69) (37.32,57), add line to (37.32,57), add line to (37.32,57), add curve to (37.32,60.31) (34.63,63) (31.32,63), add line to (6,63), add line to (6,63), add curve to (2.69,63) (0,60.31) (0,57), add line to (0,57), add line to (0,51), add line to (0,40.50), add line to (0,39), add line to (0,37.50), add line to (0,36), add line to (0,28.50), add line to (0,27), add line to (0,25.50), add line to (0,24), add line to (0,18), add line to (0,12), close subpath)])
       )
     )
   )
diff --git a/Source/WebCore/page/DebugPageOverlays.cpp b/Source/WebCore/page/DebugPageOverlays.cpp
index 231f630f320b..1322726d9f5d 100644
--- a/Source/WebCore/page/DebugPageOverlays.cpp
+++ b/Source/WebCore/page/DebugPageOverlays.cpp
@@ -378,7 +378,7 @@ std::optional<InteractionRegion> InteractionRegionOverlay::activeRegion() const
         if (!boundingRect.contains(m_mouseLocationInContentCoordinates))
             continue;
 
-        auto paths = pathsForRect(rectInOverlayCoordinates, region.borderRadius);
+        auto paths = pathsForRect(rectInOverlayCoordinates, region.cornerRadius);
         bool didHitRegion = false;
         for (const auto& path : paths) {
             if (path.contains(m_mouseLocationInContentCoordinates)) {
@@ -534,7 +534,7 @@ void InteractionRegionOverlay::drawRect(PageOverlay&, GraphicsContext& context,
         Vector<Path> clipPaths;
 
         if (shouldClip)
-            clipPaths = pathsForRect(region->rectInLayerCoordinates, region->borderRadius);
+            clipPaths = pathsForRect(region->rectInLayerCoordinates, region->cornerRadius);
 
         bool shouldUseBackdropGradient = !shouldClip || !region || (!valueForSetting("wash"_s) && valueForSetting("clip"_s));
 
diff --git a/Source/WebCore/page/InteractionRegion.cpp b/Source/WebCore/page/InteractionRegion.cpp
index ed588bda6826..97388ac8e0af 100644
--- a/Source/WebCore/page/InteractionRegion.cpp
+++ b/Source/WebCore/page/InteractionRegion.cpp
@@ -43,7 +43,6 @@
 #include "LocalFrame.h"
 #include "LocalFrameView.h"
 #include "Page.h"
-#include "PathUtilities.h"
 #include "PlatformMouseEvent.h"
 #include "PseudoClassChangeInvalidation.h"
 #include "RenderAncestorIterator.h"
@@ -281,18 +280,31 @@ std::optional<InteractionRegion> interactionRegionForRenderedRegion(RenderObject
     if (!isOriginalMatch && !isInlineNonBlock && !renderer.style().isDisplayTableOrTablePart())
         return std::nullopt;
 
-    float borderRadius = 0;
     auto rect = bounds;
-    OptionSet<InteractionRegion::CornerMask> maskedCorners;
+    float cornerRadius = 0;
+    OptionSet<InteractionRegion::CornerMask> maskedCorners { };
+    std::optional<Path> clipPath = std::nullopt;
 
     if (const auto& renderBox = dynamicDowncast<RenderBox>(regionRenderer)) {
-        auto borderRadii = renderBox->borderRadii();
+        auto roundedRect = renderBox->borderRoundedRect();
+        auto borderRadii = roundedRect.radii();
         auto minRadius = borderRadii.minimumRadius();
         auto maxRadius = borderRadii.maximumRadius();
 
-        if (minRadius != maxRadius && !minRadius) {
-            // We apply the maximum radius to specific corners.
-            borderRadius = maxRadius;
+        bool needsClipPath = false;
+        auto checkIfClipPathNeeded = [&](auto radius) {
+            if (radius != minRadius && radius != maxRadius)
+                needsClipPath = true;
+        };
+        checkIfClipPathNeeded(borderRadii.topLeft().minDimension());
+        checkIfClipPathNeeded(borderRadii.topRight().minDimension());
+        checkIfClipPathNeeded(borderRadii.bottomLeft().minDimension());
+        checkIfClipPathNeeded(borderRadii.bottomRight().minDimension());
+
+        if (minRadius == maxRadius)
+            cornerRadius = minRadius;
+        else if (!minRadius && !needsClipPath) {
+            cornerRadius = maxRadius;
             if (borderRadii.topLeft().minDimension() == maxRadius)
                 maskedCorners.add(InteractionRegion::CornerMask::MinXMinYCorner);
             if (borderRadii.topRight().minDimension() == maxRadius)
@@ -302,8 +314,9 @@ std::optional<InteractionRegion> interactionRegionForRenderedRegion(RenderObject
             if (borderRadii.bottomRight().minDimension() == maxRadius)
                 maskedCorners.add(InteractionRegion::CornerMask::MaxXMaxYCorner);
         } else {
-            // We default to the minimum radius applied uniformly to all corners.
-            borderRadius = minRadius;
+            Path path;
+            path.addRoundedRect(roundedRect);
+            clipPath = path;
         }
     }
 
@@ -318,7 +331,7 @@ std::optional<InteractionRegion> interactionRegionForRenderedRegion(RenderObject
 
     if (canTweakShape) {
         // We can safely tweak the bounds and radius without causing visual mismatch.
-        borderRadius = std::max<float>(borderRadius, regionRenderer.document().settings().interactionRegionMinimumCornerRadius());
+        cornerRadius = std::max<float>(cornerRadius, regionRenderer.document().settings().interactionRegionMinimumCornerRadius());
         if (isInlineNonBlock)
             rect.inflate(regionRenderer.document().settings().interactionRegionInlinePadding());
     }
@@ -327,8 +340,9 @@ std::optional<InteractionRegion> interactionRegionForRenderedRegion(RenderObject
         InteractionRegion::Type::Interaction,
         elementIdentifier,
         rect,
-        borderRadius,
-        maskedCorners
+        cornerRadius,
+        maskedCorners,
+        clipPath
     } };
 }
 
@@ -338,18 +352,22 @@ TextStream& operator<<(TextStream& ts, const InteractionRegion& interactionRegio
         ? "interaction"
         : (interactionRegion.type == InteractionRegion::Type::Occlusion ? "occlusion" : "guard");
     ts.dumpProperty(regionName, interactionRegion.rectInLayerCoordinates);
-    auto radius = interactionRegion.borderRadius;
-    if (interactionRegion.maskedCorners.isEmpty())
-        ts.dumpProperty("borderRadius", radius);
-    else {
-        auto mask = interactionRegion.maskedCorners;
-        ts.dumpProperty("borderRadius", makeString(
-            mask.contains(InteractionRegion::CornerMask::MinXMinYCorner) ? radius : 0, ' ',
-            mask.contains(InteractionRegion::CornerMask::MaxXMinYCorner) ? radius : 0, ' ',
-            mask.contains(InteractionRegion::CornerMask::MaxXMaxYCorner) ? radius : 0, ' ',
-            mask.contains(InteractionRegion::CornerMask::MinXMaxYCorner) ? radius : 0
-        ));
+    auto radius = interactionRegion.cornerRadius;
+    if (radius > 0) {
+        if (interactionRegion.maskedCorners.isEmpty())
+            ts.dumpProperty("cornerRadius", radius);
+        else  {
+            auto mask = interactionRegion.maskedCorners;
+            ts.dumpProperty("cornerRadius", makeString(
+                mask.contains(InteractionRegion::CornerMask::MinXMinYCorner) ? radius : 0, ' ',
+                mask.contains(InteractionRegion::CornerMask::MaxXMinYCorner) ? radius : 0, ' ',
+                mask.contains(InteractionRegion::CornerMask::MaxXMaxYCorner) ? radius : 0, ' ',
+                mask.contains(InteractionRegion::CornerMask::MinXMaxYCorner) ? radius : 0
+            ));
+        }
     }
+    if (interactionRegion.clipPath)
+        ts.dumpProperty("clipPath", interactionRegion.clipPath.value());
 
     return ts;
 }
diff --git a/Source/WebCore/page/InteractionRegion.h b/Source/WebCore/page/InteractionRegion.h
index 63087ad289be..cd197e7a0e03 100644
--- a/Source/WebCore/page/InteractionRegion.h
+++ b/Source/WebCore/page/InteractionRegion.h
@@ -27,6 +27,7 @@
 
 #include "ElementIdentifier.h"
 #include "FloatRect.h"
+#include "Path.h"
 #include "Region.h"
 
 namespace IPC {
@@ -56,14 +57,24 @@ struct InteractionRegion {
     Type type;
     ElementIdentifier elementIdentifier;
     FloatRect rectInLayerCoordinates;
-    float borderRadius { 0 };
+    float cornerRadius { 0 };
     OptionSet<CornerMask> maskedCorners { };
+    std::optional<Path> clipPath { std::nullopt };
 
     WEBCORE_EXPORT ~InteractionRegion();
-
-    friend bool operator==(const InteractionRegion&, const InteractionRegion&) = default;
 };
 
+inline bool operator==(const InteractionRegion& a, const InteractionRegion& b)
+{
+    return a.type == b.type
+        && a.elementIdentifier == b.elementIdentifier
+        && a.rectInLayerCoordinates == b.rectInLayerCoordinates
+        && a.cornerRadius == b.cornerRadius
+        && a.maskedCorners == b.maskedCorners
+        && a.clipPath.has_value() == b.clipPath.has_value()
+        && (!a.clipPath || &a.clipPath.value() == &b.clipPath.value());
+}
+
 WEBCORE_EXPORT std::optional<InteractionRegion> interactionRegionForRenderedRegion(RenderObject&, const FloatRect&);
 WEBCORE_EXPORT bool elementMatchesHoverRules(Element&);
 
diff --git a/Source/WebCore/rendering/EventRegion.cpp b/Source/WebCore/rendering/EventRegion.cpp
index 1124a2b82efb..49152e1c6b20 100644
--- a/Source/WebCore/rendering/EventRegion.cpp
+++ b/Source/WebCore/rendering/EventRegion.cpp
@@ -29,6 +29,7 @@
 #include "HTMLFormControlElement.h"
 #include "Logging.h"
 #include "Path.h"
+#include "PathUtilities.h"
 #include "RenderAncestorIterator.h"
 #include "RenderBox.h"
 #include "RenderStyleInlines.h"
@@ -135,34 +136,15 @@ void EventRegionContext::uniteInteractionRegions(RenderObject& renderer, const F
 
         m_interactionRects.add(rectForTracking);
 
-        auto regionIterator = m_discoveredRegionsByElement.find(interactionRegion->elementIdentifier);
-        if (regionIterator != m_discoveredRegionsByElement.end()) {
-            auto discoveredRegion = regionIterator->value;
-            
-            // Note: elements with multiple rects still get the `enclosingIntRect` treatment.
-            // Will be fixed in rdar://119259119.
-            Region tempRegion;
-            tempRegion.unite(rectForTracking);
-            tempRegion.subtract(discoveredRegion);
-            if (tempRegion.isEmpty())
-                return;
-            
-            discoveredRegion.unite(tempRegion);
-            m_discoveredRegionsByElement.set(interactionRegion->elementIdentifier, discoveredRegion);
-
-            for (auto rect : tempRegion.rects()) {
-                m_interactionRegions.append({
-                    InteractionRegion::Type::Interaction,
-                    interactionRegion->elementIdentifier,
-                    rect,
-                    interactionRegion->borderRadius,
-                    interactionRegion->maskedCorners
-                });
-            }
+        auto discoveredIterator = m_discoveredRectsByElement.find(interactionRegion->elementIdentifier);
+        if (discoveredIterator != m_discoveredRectsByElement.end()) {
+            discoveredIterator->value.append(interactionRegion->rectInLayerCoordinates);
             return;
         }
 
-        m_discoveredRegionsByElement.add(interactionRegion->elementIdentifier, rectForTracking);
+        Vector<FloatRect, 1> discoveredRects;
+        discoveredRects.append(interactionRegion->rectInLayerCoordinates);
+        m_discoveredRectsByElement.add(interactionRegion->elementIdentifier, discoveredRects);
     
         auto guardRect = guardRectForRegionBounds(interactionRegion->rectInLayerCoordinates);
         if (guardRect) {
@@ -184,17 +166,21 @@ bool EventRegionContext::shouldConsolidateInteractionRegion(RenderObject& render
             continue;
 
         auto ancestorElementIdentifier = ancestor.element()->identifier();
-        auto regionIterator = m_discoveredRegionsByElement.find(ancestorElementIdentifier);
+        auto discoveredIterator = m_discoveredRectsByElement.find(ancestorElementIdentifier);
 
         // The ancestor has no known InteractionRegion, we can skip it.
-        if (regionIterator == m_discoveredRegionsByElement.end()) {
+        if (discoveredIterator == m_discoveredRectsByElement.end()) {
             // If it has a border / background, stop the search.
             if (ancestor.hasVisibleBoxDecorations())
                 return false;
             continue;
         }
 
-        auto ancestorBounds = regionIterator->value.bounds();
+        // The ancestor has multiple known rects (e.g. multi-line links), we can skip it.
+        if (discoveredIterator->value.size() > 1)
+            continue;
+
+        auto& ancestorBounds = discoveredIterator->value.first();
 
         // The ancestor's InteractionRegion does not contain ours, we don't consolidate and stop the search.
         if (!ancestorBounds.contains(bounds))
@@ -244,97 +230,62 @@ bool EventRegionContext::shouldConsolidateInteractionRegion(RenderObject& render
     return false;
 }
 
-// FIXME: (rdar://119259119) switch to `PathUtilities::pathsWithShrinkWrappedRects`
 void EventRegionContext::shrinkWrapInteractionRegions()
 {
     for (auto& region : m_interactionRegions) {
         if (region.type != InteractionRegion::Type::Interaction)
             continue;
 
-        auto regionIterator = m_discoveredRegionsByElement.find(region.elementIdentifier);
-        if (regionIterator == m_discoveredRegionsByElement.end())
+        auto discoveredIterator = m_discoveredRectsByElement.find(region.elementIdentifier);
+        if (discoveredIterator == m_discoveredRectsByElement.end())
             continue;
 
-        auto discoveredRegion = regionIterator->value;
-        auto enclosingRect = enclosingIntRect(region.rectInLayerCoordinates);
-        if (enclosingRect == discoveredRegion.bounds())
+        auto discoveredRects = discoveredIterator->value;
+        if (discoveredRects.size() == 1)
             continue;
 
-        auto maskedCorners = region.maskedCorners;
-        // Create a mask with all corners so we can selectively disable them.
-        if (maskedCorners.isEmpty()) {
-            maskedCorners.add(InteractionRegion::CornerMask::MinXMinYCorner);
-            maskedCorners.add(InteractionRegion::CornerMask::MaxXMinYCorner);
-            maskedCorners.add(InteractionRegion::CornerMask::MinXMaxYCorner);
-            maskedCorners.add(InteractionRegion::CornerMask::MaxXMaxYCorner);
-        }
-
-        auto horizontallyInflatedRect = enclosingRect;
-        horizontallyInflatedRect.inflateX(1);
-        horizontallyInflatedRect.inflateY(-1);
-        auto verticallyInflatedRect = enclosingRect;
-        verticallyInflatedRect.inflateY(1);
-        verticallyInflatedRect.inflateX(-1);
-
-        bool changedMaskedCorners = false;
-
-        if (discoveredRegion.contains(horizontallyInflatedRect.minXMinYCorner()) || discoveredRegion.contains(verticallyInflatedRect.minXMinYCorner())) {
-            maskedCorners.remove(InteractionRegion::CornerMask::MinXMinYCorner);
-            changedMaskedCorners = true;
-        }
-        if (discoveredRegion.contains(horizontallyInflatedRect.maxXMinYCorner()) || discoveredRegion.contains(verticallyInflatedRect.maxXMinYCorner())) {
-            maskedCorners.remove(InteractionRegion::CornerMask::MaxXMinYCorner);
-            changedMaskedCorners = true;
-        }
-        if (discoveredRegion.contains(horizontallyInflatedRect.minXMaxYCorner()) || discoveredRegion.contains(verticallyInflatedRect.minXMaxYCorner())) {
-            maskedCorners.remove(InteractionRegion::CornerMask::MinXMaxYCorner);
-            changedMaskedCorners = true;
-        }
-        if (discoveredRegion.contains(horizontallyInflatedRect.maxXMaxYCorner()) || discoveredRegion.contains(verticallyInflatedRect.maxXMaxYCorner())) {
-            maskedCorners.remove(InteractionRegion::CornerMask::MaxXMaxYCorner);
-            changedMaskedCorners = true;
-        }
+        FloatRect layerBounds;
+        for (const auto& rect : discoveredRects)
+            layerBounds.unite(rect);
 
-        if (maskedCorners.isEmpty())
-            region.borderRadius = 0;
-        else if (changedMaskedCorners)
-            region.maskedCorners = maskedCorners;
+        Path path = PathUtilities::pathWithShrinkWrappedRects(discoveredRects, region.cornerRadius);
+        region.rectInLayerCoordinates = layerBounds;
+        path.translate(-toFloatSize(layerBounds.location()));
+        region.clipPath = path;
+        region.cornerRadius = 0;
     }
 }
 
 void EventRegionContext::removeSuperfluousInteractionRegions()
 {
     m_interactionRegions.removeAllMatching([&] (auto& region) {
-        if (region.type == InteractionRegion::Type::Guard) {
-            for (auto& entry : m_discoveredRegionsByElement) {
-                // This is the element being guarded.
-                if (entry.key == region.elementIdentifier)
-                    continue;
-
-                auto guardRect = enclosingIntRect(region.rectInLayerCoordinates);
-                auto interactionRegion = entry.value;
-
-                auto intersection = interactionRegion;
-                intersection.intersect(guardRect);
-                if (intersection.isEmpty())
-                    continue;
-
-                // This is an interactive container of the guarded region.
-                if (intersection.contains(guardRect))
-                    continue;
-
-                auto originalBounds = interactionRegion.bounds();
-                auto intersectionBounds = intersection.bounds();
-                bool tooMuchOverlap = originalBounds.width() / 2 < intersectionBounds.width()
-                    || originalBounds.height() / 2 < intersectionBounds.height();
-
-                if (tooMuchOverlap)
-                    return true;
-            }
-            return false;
+        if (region.type != InteractionRegion::Type::Guard)
+            return m_containersToRemove.contains(region.elementIdentifier);
+
+        auto guardRect = enclosingIntRect(region.rectInLayerCoordinates);
+        for (const auto& interactionRect : m_interactionRects) {
+            auto intersection = interactionRect;
+            intersection.intersect(guardRect);
+
+            if (intersection.isEmpty())
+                continue;
+
+            // This is an interactive container of the guarded region.
+            if (intersection.contains(guardRect))
+                continue;
+
+            // This is probably the element being guarded.
+            if (intersection.contains(interactionRect) && guardRect.center() == interactionRect.center())
+                continue;
+
+            bool tooMuchOverlap = interactionRect.width() / 2 < intersection.width()
+                || interactionRect.height() / 2 < intersection.height();
+
+            if (tooMuchOverlap)
+                return true;
         }
 
-        return m_containersToRemove.contains(region.elementIdentifier);
+        return false;
     });
 }
 
diff --git a/Source/WebCore/rendering/EventRegion.h b/Source/WebCore/rendering/EventRegion.h
index e14489603cd0..3f0e81dfe277 100644
--- a/Source/WebCore/rendering/EventRegion.h
+++ b/Source/WebCore/rendering/EventRegion.h
@@ -73,7 +73,7 @@ class EventRegionContext : public RegionContext {
     HashSet<IntRect> m_occlusionRects;
     HashSet<ElementIdentifier> m_containerRemovalCandidates;
     HashSet<ElementIdentifier> m_containersToRemove;
-    HashMap<ElementIdentifier, Region> m_discoveredRegionsByElement;
+    HashMap<ElementIdentifier, Vector<FloatRect>> m_discoveredRectsByElement;
 #endif
 };
 
diff --git a/Source/WebCore/rendering/RenderBox.cpp b/Source/WebCore/rendering/RenderBox.cpp
index 22965f838718..200443ea15c6 100644
--- a/Source/WebCore/rendering/RenderBox.cpp
+++ b/Source/WebCore/rendering/RenderBox.cpp
@@ -753,6 +753,15 @@ LayoutUnit RenderBox::constrainContentBoxLogicalHeightByMinMax(LayoutUnit logica
     return logicalHeight;
 }
 
+RoundedRect RenderBox::borderRoundedRect() const
+{
+    auto& style = this->style();
+    LayoutRect bounds = frameRect();
+    bounds.setLocation({ });
+
+    return style.getRoundedBorderFor(bounds);
+}
+
 RoundedRect::Radii RenderBox::borderRadii() const
 {
     auto& style = this->style();
diff --git a/Source/WebCore/rendering/RenderBox.h b/Source/WebCore/rendering/RenderBox.h
index 0cb75100536f..055d13131f3a 100644
--- a/Source/WebCore/rendering/RenderBox.h
+++ b/Source/WebCore/rendering/RenderBox.h
@@ -111,6 +111,7 @@ class RenderBox : public RenderBoxModelObject {
     inline LayoutSize borderBoxLogicalSize() const;
 
     WEBCORE_EXPORT RoundedRectRadii borderRadii() const;
+    RoundedRect borderRoundedRect() const;
     RoundedRect roundedBorderBoxRect() const;
 
     // The content area of the box (excludes padding - and intrinsic padding for table cells, etc... - and border).
diff --git a/Source/WebCore/rendering/RenderLayerBacking.cpp b/Source/WebCore/rendering/RenderLayerBacking.cpp
index 7aac52a764e3..39126ae09d0d 100644
--- a/Source/WebCore/rendering/RenderLayerBacking.cpp
+++ b/Source/WebCore/rendering/RenderLayerBacking.cpp
@@ -3747,7 +3747,7 @@ void RenderLayerBacking::paintDebugOverlays(const GraphicsLayer* graphicsLayer,
             
             auto rect = region.rectInLayerCoordinates;
             Path path;
-            path.addRoundedRect(rect, { region.borderRadius, region.borderRadius });
+            path.addRoundedRect(rect, { region.cornerRadius, region.cornerRadius });
             context.strokePath(path);
         }
     }
diff --git a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
index cbc5cd3eeef4..ced5a5310937 100644
--- a/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
+++ b/Source/WebKit/Shared/WebCoreArgumentCoders.serialization.in
@@ -5583,8 +5583,9 @@ struct WebCore::InteractionRegion {
     WebCore::InteractionRegion::Type type;
     WebCore::ElementIdentifier elementIdentifier;
     WebCore::FloatRect rectInLayerCoordinates;
-    float borderRadius;
+    float cornerRadius;
     OptionSet<WebCore::InteractionRegion::CornerMask> maskedCorners;
+    std::optional<WebCore::Path> clipPath;
 };
 
 [Nested, AdditionalEncoder=StreamConnectionEncoder] struct WebCore::Region::Span {
diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm
index 12dc6226915a..302c7e8535be 100644
--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm
+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewTesting.mm
@@ -82,7 +82,11 @@ - (NSString *)_caLayerTreeAsText
     {
         TextStream::GroupScope scope(ts);
         ts << "CALayer tree root ";
+#if PLATFORM(IOS_FAMILY)
+        dumpCALayer(ts, [_contentView layer], true);
+#else
         dumpCALayer(ts, self.layer, true);
+#endif
     }
 
     return ts.release();
@@ -101,8 +105,15 @@ static void dumpCALayer(TextStream& ts, CALayer *layer, bool traverse)
 #if ENABLE(INTERACTION_REGIONS_IN_EVENT_REGION)
     NSNumber *interactionRegionLayerType = [layer valueForKey:@"WKInteractionRegionType"];
     if (interactionRegionLayerType) {
-        ts.dumpProperty("type", interactionRegionLayerType);
         traverse = false;
+
+        ts.dumpProperty("type", interactionRegionLayerType);
+
+        if (layer.mask) {
+            TextStream::GroupScope scope(ts);
+            ts << "mask";
+            ts.dumpProperty("frame", rectToString(layer.mask.frame));
+        }
     }
 #endif
 
@@ -125,6 +136,10 @@ static void dumpCALayer(TextStream& ts, CALayer *layer, bool traverse)
 
     if (layer.cornerRadius != 0.0)
         ts.dumpProperty("layer cornerRadius", makeString(layer.cornerRadius));
+
+    constexpr CACornerMask allCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
+    if (layer.maskedCorners != allCorners)
+        ts.dumpProperty("layer masked corners", makeString(layer.maskedCorners));
     
     if (traverse && layer.sublayers.count > 0) {
         TextStream::GroupScope scope(ts);
diff --git a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeInteractionRegionLayers.mm b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeInteractionRegionLayers.mm
index 1003f9fbb42e..2c6cf9c6f11d 100644
--- a/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeInteractionRegionLayers.mm
+++ b/Source/WebKit/UIProcess/RemoteLayerTree/RemoteLayerTreeInteractionRegionLayers.mm
@@ -275,8 +275,8 @@ void updateLayersForInteractionRegions(RemoteLayerTreeNode& node)
             [regionLayer setFrame:rect];
 
         if (region.type == InteractionRegion::Type::Interaction) {
-            [regionLayer setCornerRadius:region.borderRadius];
-            if (region.borderRadius)
+            [regionLayer setCornerRadius:region.cornerRadius];
+            if (region.cornerRadius)
                 [regionLayer setCornerCurve:kCACornerCurveCircular];
 
             constexpr CACornerMask allCorners = kCALayerMinXMinYCorner | kCALayerMaxXMinYCorner | kCALayerMinXMaxYCorner | kCALayerMaxXMaxYCorner;
@@ -284,6 +284,18 @@ void updateLayersForInteractionRegions(RemoteLayerTreeNode& node)
                 [regionLayer setMaskedCorners:allCorners];
             else
                 [regionLayer setMaskedCorners:convertToCACornerMask(region.maskedCorners)];
+
+            if (region.clipPath) {
+                RetainPtr<CAShapeLayer> mask = [regionLayer mask];
+                if (!mask) {
+                    mask = adoptNS([[CAShapeLayer alloc] init]);
+                    [regionLayer setMask:mask.get()];
+                }
+
+                [mask setFrame:[regionLayer bounds]];
+                [mask setPath:region.clipPath->platformPath()];
+            } else
+                [regionLayer setMask:nil];
         }
 
         if ([container.sublayers objectAtIndex:insertionPoint] != regionLayer) {