commit 432ec43843ed7903e607a15f447641e8563c3013 parent c0cf79519bda42541a11d33ef01dc4771f6043c4 Author: Daniil Sakhapov <sakhapov@chromium.org> Date: Fri, 31 Oct 2025 08:42:08 +0000 Bug 1996534 [wpt PR 55672] - Change default boxes for two shapes border-shape, a=testonly Automatic update from web-platform-tests Change default boxes for two shapes border-shape When two <basic-shape> values are given, the first (outer) one defaults to the border box and the second (inner) one defaults to the padding box. This allows using the different border-width properties to affect the final shape. Bug: 448653232 Change-Id: I0813a3cf4bb2a4f954ccf553202c108c8751c2ba Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7079121 Reviewed-by: Philip Rogers <pdr@chromium.org> Commit-Queue: Daniil Sakhapov <sakhapov@chromium.org> Cr-Commit-Position: refs/heads/main@{#1535844} -- wpt-commits: ab63c064b97f5869a68a41603966b2acfe0145fc wpt-pr: 55672 Diffstat:
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/testing/web-platform/tests/css/css-borders/tentative/border-shape/border-shape-double-shape-default-ref.html b/testing/web-platform/tests/css/css-borders/tentative/border-shape/border-shape-double-shape-default-ref.html @@ -18,10 +18,10 @@ body { } /* Both should be identical with explicit border-box */ #double-implicit { - border-shape: circle(50%) border-box circle(40%) border-box; + border-shape: circle(50%) border-box circle(40%) padding-box; } #double-explicit { - border-shape: circle(50%) border-box circle(40%) border-box; + border-shape: circle(50%) border-box circle(40%) padding-box; } </style> <div class="container"> diff --git a/testing/web-platform/tests/css/css-borders/tentative/border-shape/border-shape-double-shape-default.html b/testing/web-platform/tests/css/css-borders/tentative/border-shape/border-shape-double-shape-default.html @@ -19,13 +19,13 @@ body { border: 20px solid rgba(255, 0, 0, 0.5); fill: rgba(0, 255, 0, 0.3); } -/* Double shape - should default to border-box for both */ +/* Double shape - should default to border-box + padding-box */ #double-implicit { border-shape: circle(50%) circle(40%); } /* Explicit border-box should match */ #double-explicit { - border-shape: circle(50%) border-box circle(40%) border-box; + border-shape: circle(50%) border-box circle(40%) padding-box; } </style> <div class="container"> diff --git a/testing/web-platform/tests/css/css-borders/tentative/parsing/border-shape-computed.html b/testing/web-platform/tests/css/css-borders/tentative/parsing/border-shape-computed.html @@ -13,14 +13,15 @@ test_computed_value("border-shape", "none"); test_computed_value("border-shape", "circle()"); test_computed_value("border-shape", "polygon(10px 10px, 100px 10px, 10px 100px)"); test_computed_value("border-shape", "shape(from 0px 0px, hline to 100px, vline to 100px, close)"); -test_computed_value("border-shape", "circle() circle()", "circle()"); +test_computed_value("border-shape", "circle() circle()"); +test_computed_value("border-shape", "circle() border-box circle() padding-box", "circle() circle()"); test_computed_value("border-shape", "circle() polygon(10px 10px, 100px 10px, 10px 100px)"); test_computed_value("border-shape", "circle() content-box"); test_computed_value("border-shape", "circle() border-box"); -test_computed_value("border-shape", "circle() border-box polygon(10px 10px, 100px 10px, 10px 100px) border-box", "circle() polygon(10px 10px, 100px 10px, 10px 100px)"); -test_computed_value("border-shape", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px) border-box", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px)"); -test_computed_value("border-shape", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px) padding-box", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px) padding-box"); -test_computed_value("border-shape", "circle() polygon(10px 10px, 100px 10px, 10px 100px) border-box", "circle() polygon(10px 10px, 100px 10px, 10px 100px)"); +test_computed_value("border-shape", "circle() border-box polygon(10px 10px, 100px 10px, 10px 100px) border-box", "circle() polygon(10px 10px, 100px 10px, 10px 100px) border-box"); +test_computed_value("border-shape", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px) border-box", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px) border-box"); +test_computed_value("border-shape", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px) padding-box", "circle() padding-box polygon(10px 10px, 100px 10px, 10px 100px)"); +test_computed_value("border-shape", "circle() polygon(10px 10px, 100px 10px, 10px 100px) border-box", "circle() polygon(10px 10px, 100px 10px, 10px 100px) border-box"); test_computed_value("border-shape", "circle() polygon(10px 10px, 100px 10px, 10px 100px) content-box", "circle() polygon(10px 10px, 100px 10px, 10px 100px) content-box"); test_computed_value("border-shape", "circle() half-border-box", "circle()"); test_computed_value("border-shape", "circle() half-border-box circle() half-border-box", "circle()"); diff --git a/testing/web-platform/tests/css/css-borders/tentative/parsing/border-shape-valid.html b/testing/web-platform/tests/css/css-borders/tentative/parsing/border-shape-valid.html @@ -10,7 +10,7 @@ test_valid_value("border-shape", "none"); test_valid_value("border-shape", "circle()"); test_valid_value("border-shape", "polygon(10px 10px, 100px 10px, 10px 100px)"); test_valid_value("border-shape", "shape(from 0px 0px, hline to 100px, vline to 100px, close)"); -test_valid_value("border-shape", "circle() circle()", "circle()"); +test_valid_value("border-shape", "circle() circle()"); test_valid_value("border-shape", "circle() polygon(10px 10px, 100px 10px, 10px 100px)"); test_valid_value("border-shape", "circle() border-box circle() content-box"); test_valid_value("border-shape", "circle() margin-box circle() view-box");