From 83143e3018b19ebaf747a3c7bb9d6a914181b6d0 Mon Sep 17 00:00:00 2001 From: Tim Ledbetter Date: Tue, 18 Mar 2025 15:00:44 +0000 Subject: [PATCH] LibWeb: Avoid repetition when serializing grid track placement values --- Libraries/LibWeb/CSS/GridTrackPlacement.cpp | 3 +-- .../css/css-grid/parsing/grid-area-computed.txt | 10 +++++----- .../css/css-grid/parsing/grid-area-shorthand.txt | 8 ++++---- .../css/css-grid/parsing/grid-area-valid.txt | 8 ++++---- .../css/css-grid/parsing/grid-column-shorthand.txt | 8 ++++---- .../css/css-grid/parsing/grid-row-shorthand.txt | 8 ++++---- 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Libraries/LibWeb/CSS/GridTrackPlacement.cpp b/Libraries/LibWeb/CSS/GridTrackPlacement.cpp index 9aeab5ad14a..c5c4285f472 100644 --- a/Libraries/LibWeb/CSS/GridTrackPlacement.cpp +++ b/Libraries/LibWeb/CSS/GridTrackPlacement.cpp @@ -22,8 +22,7 @@ String GridTrackPlacement::to_string() const builder.appendff("{} {}", *area_or_line.line_number, *area_or_line.name); } else if (area_or_line.line_number.has_value()) { builder.appendff("{}", *area_or_line.line_number); - } - if (area_or_line.name.has_value()) { + } else if (area_or_line.name.has_value()) { builder.appendff("{}", *area_or_line.name); } }, diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-computed.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-computed.txt index 69b73336345..d6bb6d0ba8d 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-computed.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-computed.txt @@ -2,8 +2,8 @@ Harness status: OK Found 30 tests -9 Pass -21 Fail +12 Pass +18 Fail Fail Property grid-area value 'auto / auto / auto / auto' Pass Property grid-row value 'auto / auto' Pass Property grid-column-end value 'auto' @@ -13,12 +13,12 @@ Fail Property grid-column-start value '-_π' Pass Property grid-row-end value '_9' Fail Property grid-area value '1 / 90 -a- / auto / auto' Fail Property grid-row value '2 az / auto' -Fail Property grid-column value '9 / -19 zA' +Pass Property grid-column value '9 / -19 zA' Pass Property grid-row-start value '-19' Fail Property grid-row-start value '9 -Z_' -Fail Property grid-column-start value '-44 Z' +Pass Property grid-column-start value '-44 Z' Fail Property grid-row-end value '1 -πA' -Fail Property grid-column-end value '5 π_' +Pass Property grid-column-end value '5 π_' Fail Property grid-area value 'span 2 i / auto / auto / auto' Pass Property grid-row value 'span 2 / auto' Fail Property grid-column-start value 'span 1 i' diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-shorthand.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-shorthand.txt index fa20a853e32..e956d974aed 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-shorthand.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-shorthand.txt @@ -2,8 +2,8 @@ Harness status: OK Found 53 tests -42 Pass -11 Fail +44 Pass +9 Fail Pass e.style['grid-area'] = "auto" should set grid-column-end Pass e.style['grid-area'] = "auto" should set grid-column-start Pass e.style['grid-area'] = "auto" should set grid-row-end @@ -45,8 +45,8 @@ Pass e.style['grid-row'] = "auto" should not set unrelated longhands Pass e.style['grid-row'] = "one / 2" should set grid-row-end Pass e.style['grid-row'] = "one / 2" should set grid-row-start Pass e.style['grid-row'] = "one / 2" should not set unrelated longhands -Fail e.style['grid-row'] = "1 two / four 3" should set grid-row-end -Fail e.style['grid-row'] = "1 two / four 3" should set grid-row-start +Pass e.style['grid-row'] = "1 two / four 3" should set grid-row-end +Pass e.style['grid-row'] = "1 two / four 3" should set grid-row-start Pass e.style['grid-row'] = "1 two / four 3" should not set unrelated longhands Pass e.style['grid-column'] = "5 span" should set grid-column-end Pass e.style['grid-column'] = "5 span" should set grid-column-start diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-valid.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-valid.txt index d37fda17e4f..78aecb39938 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-valid.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-area-valid.txt @@ -2,8 +2,8 @@ Harness status: OK Found 57 tests -13 Pass -44 Fail +15 Pass +42 Fail Fail e.style['grid-area'] = "auto" should set the property value Fail e.style['grid-area'] = "auto / auto" should set the property value Fail e.style['grid-area'] = "auto / auto / auto" should set the property value @@ -28,9 +28,9 @@ Fail e.style['grid-column'] = "-A0 33" should set the property value Pass e.style['grid-row-start'] = "-19" should set the property value Fail e.style['grid-row-start'] = "9 -Z_" should set the property value Pass e.style['grid-column-start'] = "+90" should set the property value -Fail e.style['grid-column-start'] = "Z -44" should set the property value +Pass e.style['grid-column-start'] = "Z -44" should set the property value Fail e.style['grid-row-end'] = "1 -πA" should set the property value -Fail e.style['grid-column-end'] = "π_ +5" should set the property value +Pass e.style['grid-column-end'] = "π_ +5" should set the property value Fail e.style['grid-area'] = "span 2 i" should set the property value Fail e.style['grid-area'] = "i 2 SpAn" should set the property value Fail e.style['grid-area'] = "span 1 i" should set the property value diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-column-shorthand.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-column-shorthand.txt index c4350c9f3d7..bd3e8990136 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-column-shorthand.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-column-shorthand.txt @@ -2,8 +2,8 @@ Harness status: OK Found 48 tests -36 Pass -12 Fail +38 Pass +10 Fail Pass e.style['grid-column'] = "auto / auto" should set grid-column-end Pass e.style['grid-column'] = "auto / auto" should set grid-column-start Pass e.style['grid-column'] = "auto / auto" should not set unrelated longhands @@ -29,10 +29,10 @@ Pass e.style['grid-column'] = "span 2" should set grid-column-end Pass e.style['grid-column'] = "span 2" should set grid-column-start Pass e.style['grid-column'] = "span 2" should not set unrelated longhands Pass e.style['grid-column'] = "3 last / auto" should set grid-column-end -Fail e.style['grid-column'] = "3 last / auto" should set grid-column-start +Pass e.style['grid-column'] = "3 last / auto" should set grid-column-start Pass e.style['grid-column'] = "3 last / auto" should not set unrelated longhands Fail e.style['grid-column'] = "3 last" should set grid-column-end -Fail e.style['grid-column'] = "3 last" should set grid-column-start +Pass e.style['grid-column'] = "3 last" should set grid-column-start Pass e.style['grid-column'] = "3 last" should not set unrelated longhands Fail e.style['grid-column'] = "span first / auto" should set grid-column-end Fail e.style['grid-column'] = "span first / auto" should set grid-column-start diff --git a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-row-shorthand.txt b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-row-shorthand.txt index 788ae97a52c..5ba3558492d 100644 --- a/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-row-shorthand.txt +++ b/Tests/LibWeb/Text/expected/wpt-import/css/css-grid/parsing/grid-row-shorthand.txt @@ -2,8 +2,8 @@ Harness status: OK Found 48 tests -36 Pass -12 Fail +38 Pass +10 Fail Pass e.style['grid-row'] = "auto / auto" should set grid-row-end Pass e.style['grid-row'] = "auto / auto" should set grid-row-start Pass e.style['grid-row'] = "auto / auto" should not set unrelated longhands @@ -29,10 +29,10 @@ Pass e.style['grid-row'] = "span 2" should set grid-row-end Pass e.style['grid-row'] = "span 2" should set grid-row-start Pass e.style['grid-row'] = "span 2" should not set unrelated longhands Pass e.style['grid-row'] = "3 last / auto" should set grid-row-end -Fail e.style['grid-row'] = "3 last / auto" should set grid-row-start +Pass e.style['grid-row'] = "3 last / auto" should set grid-row-start Pass e.style['grid-row'] = "3 last / auto" should not set unrelated longhands Fail e.style['grid-row'] = "3 last" should set grid-row-end -Fail e.style['grid-row'] = "3 last" should set grid-row-start +Pass e.style['grid-row'] = "3 last" should set grid-row-start Pass e.style['grid-row'] = "3 last" should not set unrelated longhands Fail e.style['grid-row'] = "span first / auto" should set grid-row-end Fail e.style['grid-row'] = "span first / auto" should set grid-row-start