We use cookies to ensure you get the best experience on our website
Halaman utama Jelajahi Bantuan
Daftar Masuk
0ct0pu5
/
ladybird
1
0
Fork 0
Berkas Masalah 0 Permintaan Tarik 0 Wiki
Jelajahi Sumber

LibWeb: Ignore repeat(auto-fit/auto-fill, auto) as it is not allowed

Tommy van der Vorst 1 tahun lalu
induk
8e7cb11856
melakukan
1c7ec9c770
3 mengubah file dengan 90 tambahan dan 1 penghapusan
Tampilan Split Tampilkan Statistik Diff
  1. 62 0
      Tests/LibWeb/Layout/expected/grid/repeat-auto-fit-fill-cannot-have-auto.txt
  2. 17 0
      Tests/LibWeb/Layout/input/grid/repeat-auto-fit-fill-cannot-have-auto.html
  3. 11 1
      Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp

+ 62 - 0
Tests/LibWeb/Layout/expected/grid/repeat-auto-fit-fill-cannot-have-auto.txt
Tampilan Berkas 

@@ -0,0 +1,62 @@
 
+Viewport <#document> at (0,0) content-size 800x600 children: not-inline
 
+  BlockContainer <html> at (0,0) content-size 800x50 [BFC] children: not-inline
 
+    BlockContainer <body> at (8,8) content-size 784x34 children: not-inline
 
+      BlockContainer <div> at (8,8) content-size 784x34 children: not-inline
 
+        BlockContainer <(anonymous)> at (8,8) content-size 784x0 children: inline
 
+          TextNode <#text>
 
+        Box <div.four> at (8,8) content-size 784x34 [GFC] children: not-inline
 
+          BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+            TextNode <#text>
 
+          BlockContainer <div> at (8,8) content-size 196x17 [BFC] children: inline
 
+            frag 0 from TextNode start: 0, length: 1, rect: [8,8 14.265625x17] baseline: 13.296875
 
+                "A"
 
+            TextNode <#text>
 
+          BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+            TextNode <#text>
 
+          BlockContainer <div> at (204,8) content-size 196x17 [BFC] children: inline
 
+            frag 0 from TextNode start: 0, length: 1, rect: [204,8 9.34375x17] baseline: 13.296875
 
+                "B"
 
+            TextNode <#text>
 
+          BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+            TextNode <#text>
 
+          BlockContainer <div> at (400,8) content-size 196x17 [BFC] children: inline
 
+            frag 0 from TextNode start: 0, length: 1, rect: [400,8 10.3125x17] baseline: 13.296875
 
+                "C"
 
+            TextNode <#text>
 
+          BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+            TextNode <#text>
 
+          BlockContainer <div> at (596,8) content-size 196x17 [BFC] children: inline
 
+            frag 0 from TextNode start: 0, length: 1, rect: [596,8 11.140625x17] baseline: 13.296875
 
+                "D"
 
+            TextNode <#text>
 
+          BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+            TextNode <#text>
 
+          BlockContainer <div> at (8,25) content-size 196x17 [BFC] children: inline
 
+            frag 0 from TextNode start: 0, length: 1, rect: [8,25 11.859375x17] baseline: 13.296875
 
+                "E"
 
+            TextNode <#text>
 
+          BlockContainer <(anonymous)> (not painted) [BFC] children: inline
 
+            TextNode <#text>
 
+        BlockContainer <(anonymous)> at (8,42) content-size 784x0 children: inline
 
+          TextNode <#text>
 
+      BlockContainer <(anonymous)> at (8,42) content-size 784x0 children: inline
 
+        TextNode <#text>
 
+
 
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
 
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x50]
 
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x34]
 
+      PaintableWithLines (BlockContainer<DIV>) [8,8 784x34]
 
+        PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
 
+        PaintableBox (Box<DIV>.four) [8,8 784x34]
 
+          PaintableWithLines (BlockContainer<DIV>) [8,8 196x17]
 
+            TextPaintable (TextNode<#text>)
 
+          PaintableWithLines (BlockContainer<DIV>) [204,8 196x17]
 
+            TextPaintable (TextNode<#text>)
 
+          PaintableWithLines (BlockContainer<DIV>) [400,8 196x17]
 
+            TextPaintable (TextNode<#text>)
 
+          PaintableWithLines (BlockContainer<DIV>) [596,8 196x17]
 
+            TextPaintable (TextNode<#text>)
 
+          PaintableWithLines (BlockContainer<DIV>) [8,25 196x17]
 
+            TextPaintable (TextNode<#text>)
 
+        PaintableWithLines (BlockContainer(anonymous)) [8,42 784x0]
 
+      PaintableWithLines (BlockContainer(anonymous)) [8,42 784x0]

+ 17 - 0
Tests/LibWeb/Layout/input/grid/repeat-auto-fit-fill-cannot-have-auto.html
Tampilan Berkas 

@@ -0,0 +1,17 @@
 
+<!DOCTYPE html>
 
+<style>
 
+	.four {
 
+		display: grid;
 
+		grid-template-columns: repeat(4, 1fr);
 
+		grid-template-rows: repeat(auto-fit, auto); /* 'auto' not allowed here, line should be ignored */
 
+	}
 
+</style>
 
+<div>
 
+<div class="four">
 
+	<div>A</div>
 
+	<div>B</div>
 
+	<div>C</div>
 
+	<div>D</div>
 
+	<div>E</div>
 
+</div>
 
+</div>

+ 11 - 1
Userland/Libraries/LibWeb/CSS/Parser/Parser.cpp
Tampilan Berkas 

@@ -5,6 +5,7 @@
 
  * Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
 
  * Copyright (c) 2022, MacDue <macdue@dueutil.tech>
 
  * Copyright (c) 2024, Shannon Booth <shannon@serenityos.org>
 
+ * Copyright (c) 2024, Tommy van der Vorst <tommy@pixelspark.nl>
 
  *
 
  * SPDX-License-Identifier: BSD-2-Clause
 
  */
 
@@ -5469,9 +5470,18 @@ Optional<CSS::GridRepeat> Parser::parse_repeat(Vector<ComponentValue> const& com
 
             // The repeat() notation can’t be nested.
 
             if (track_sizing_function.value().is_repeat())
 
                 return {};
 
+
 
             // Automatic repetitions (auto-fill or auto-fit) cannot be combined with intrinsic or flexible sizes.
 
-            if (track_sizing_function.value().is_default() && track_sizing_function.value().grid_size().is_flexible_length() && (is_auto_fill || is_auto_fit))
 
+            // Note that 'auto' is also an intrinsic size (and thus not permitted) but we can't use
 
+            // track_sizing_function.is_auto(..) to check for it, as it requires AvailableSize, which is why there is
 
+            // a separate check for it below.
 
+            // https://www.w3.org/TR/css-grid-2/#repeat-syntax
 
+            // https://www.w3.org/TR/css-grid-2/#intrinsic-sizing-function
 
+            if (track_sizing_function.value().is_default()
 
+                && (track_sizing_function.value().grid_size().is_flexible_length() || token.is_ident("auto"sv))
 
+                && (is_auto_fill || is_auto_fit))
 
                 return {};
 
+
 
             repeat_params.append(track_sizing_function.value());
 
             part_two_tokens.skip_whitespace();
 
         }

Contact | Legal | Takedown | Status
Self-hosted public services - About
NibbleSpot by 0ct0pu5