RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:27:45 +00:00
Code Issues Activity Actions

LibWeb: Disambiguate GridTrackPlacement API

Browse source 
- Ambiguous `raw_value()` method is replaced with `line_number()` and
  `span()`.
- `line_name()` that before returned either line name or area name is
  replaced with `line_name()` and `area_name()`.
- `Position` type is replaced with `Line` and `Area` type so we don't
   have to guess while doing layout.

Affected test expectations:
- `template-lines-and-areas` - improvement over what we had before.
- `named-tracks` - rebaseline a giant test. will have to split it into
  smaller tests in the future.
This commit is contained in:
Aliaksandr Kalenik 2023-08-25 23:29:13 +02:00 • committed by Andreas Kling
parent 29352f570a
commit c03e025a32
7 changed files with 292 additions and 205 deletions
Download patch file Download diff file Expand all files Collapse all files

78
Tests/LibWeb/Layout/expected/grid/named-tracks.txt
View file

@ -1,7 +1,7 @@
Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <html> at (0,0) content-size 800x600 [BFC] children: not-inline
BlockContainer <body> at (8,8) content-size 784x127.40625 children: not-inline
Box <div.grid-container> at (8,8) content-size 784x17.46875 [GFC] children: not-inline
Box <div.grid-container> at (8,8) content-size 784x34.9375 [GFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (8,8) content-size 392x17.46875 [BFC] children: inline
@ -11,79 +11,79 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (400,8) content-size 392x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (8,25.46875) content-size 392x17.46875 [BFC] children: inline
line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [400,8 8.8125x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [8,25.46875 8.8125x17.46875]
"2"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <(anonymous)> at (8,25.46875) content-size 784x0 children: inline
BlockContainer <(anonymous)> at (8,42.9375) content-size 784x0 children: inline
TextNode <#text>
TextNode <#text>
TextNode <#text>
Box <div.grid-container> at (8,25.46875) content-size 784x75 [GFC] children: not-inline
Box <div.grid-container> at (8,42.9375) content-size 784x75 [GFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (8,25.46875) content-size 261.328125x75 [BFC] children: inline
BlockContainer <div.grid-item> at (8,42.9375) content-size 261.328125x25 [BFC] children: inline
line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [8,25.46875 6.34375x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [8,42.9375 6.34375x17.46875]
"1"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (530.65625,25.46875) content-size 261.328125x50 [BFC] children: inline
BlockContainer <div.grid-item> at (8,42.9375) content-size 261.328125x25 [BFC] children: inline
line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [530.65625,25.46875 8.8125x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [8,42.9375 8.8125x17.46875]
"2"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (269.328125,25.46875) content-size 261.328125x25 [BFC] children: inline
BlockContainer <div.grid-item> at (8,42.9375) content-size 261.328125x25 [BFC] children: inline
line 0 width: 9.09375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [269.328125,25.46875 9.09375x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [8,42.9375 9.09375x17.46875]
"3"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (269.328125,75.46875) content-size 522.65625x25 [BFC] children: inline
BlockContainer <div.grid-item> at (8,42.9375) content-size 261.328125x25 [BFC] children: inline
line 0 width: 7.75, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [269.328125,75.46875 7.75x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [8,42.9375 7.75x17.46875]
"4"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <(anonymous)> at (8,100.46875) content-size 784x0 children: inline
BlockContainer <(anonymous)> at (8,117.9375) content-size 784x0 children: inline
TextNode <#text>
TextNode <#text>
TextNode <#text>
Box <div.grid-container> at (8,100.46875) content-size 784x34.9375 [GFC] children: not-inline
Box <div.grid-container> at (8,117.9375) content-size 784x17.46875 [GFC] children: not-inline
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (58,100.46875) content-size 100x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (8,117.9375) content-size 50x17.46875 [BFC] children: inline
line 0 width: 6.34375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [58,100.46875 6.34375x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [8,117.9375 6.34375x17.46875]
"1"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (158,100.46875) content-size 50x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (58,117.9375) content-size 100x17.46875 [BFC] children: inline
line 0 width: 8.8125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [158,100.46875 8.8125x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [58,117.9375 8.8125x17.46875]
"2"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (208,100.46875) content-size 100x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (158,117.9375) content-size 50x17.46875 [BFC] children: inline
line 0 width: 9.09375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [208,100.46875 9.09375x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [158,117.9375 9.09375x17.46875]
"3"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
TextNode <#text>
BlockContainer <div.grid-item> at (8,117.9375) content-size 50x17.46875 [BFC] children: inline
BlockContainer <div.grid-item> at (208,117.9375) content-size 100x17.46875 [BFC] children: inline
line 0 width: 7.75, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 1, rect: [8,117.9375 7.75x17.46875]
frag 0 from TextNode start: 0, length: 1, rect: [208,117.9375 7.75x17.46875]
"4"
TextNode <#text>
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
@ -92,28 +92,28 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
PaintableWithLines (BlockContainer<BODY>) [8,8 784x127.40625]
PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
PaintableBox (Box<DIV>.grid-container) [8,8 784x34.9375]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,8 392x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [400,8 392x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,25.46875 392x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,25.46875 784x0]
PaintableBox (Box<DIV>.grid-container) [8,25.46875 784x75]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,25.46875 261.328125x75]
PaintableWithLines (BlockContainer(anonymous)) [8,42.9375 784x0]
PaintableBox (Box<DIV>.grid-container) [8,42.9375 784x75]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,42.9375 261.328125x25]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [530.65625,25.46875 261.328125x50]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,42.9375 261.328125x25]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [269.328125,25.46875 261.328125x25]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,42.9375 261.328125x25]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [269.328125,75.46875 522.65625x25]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,100.46875 784x0]
PaintableBox (Box<DIV>.grid-container) [8,100.46875 784x34.9375]
PaintableWithLines (BlockContainer<DIV>.grid-item) [58,100.46875 100x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [158,100.46875 50x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [208,100.46875 100x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,42.9375 261.328125x25]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,117.9375 784x0]
PaintableBox (Box<DIV>.grid-container) [8,117.9375 784x17.46875]
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,117.9375 50x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [58,117.9375 100x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [158,117.9375 50x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.grid-item) [208,117.9375 100x17.46875]
TextPaintable (TextNode<#text>)

6
Tests/LibWeb/Layout/expected/grid/template-lines-and-areas.txt
View file

@ -7,9 +7,9 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
frag 0 from TextNode start: 0, length: 3, rect: [8,8 21.609375x17.46875]
"1fr"
TextNode <#text>
BlockContainer <div.item-right> at (530.65625,8) content-size 261.328125x17.46875 [BFC] children: inline
BlockContainer <div.item-right> at (269.328125,8) content-size 522.65625x17.46875 [BFC] children: inline
line 0 width: 21.609375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 3, rect: [530.65625,8 21.609375x17.46875]
frag 0 from TextNode start: 0, length: 3, rect: [269.328125,8 21.609375x17.46875]
"1fr"
TextNode <#text>
@ -19,5 +19,5 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
PaintableBox (Box<DIV>.grid) [8,8 784x17.46875]
PaintableWithLines (BlockContainer<DIV>.item-left) [8,8 261.328125x17.46875]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.item-right) [530.65625,8 261.328125x17.46875]
PaintableWithLines (BlockContainer<DIV>.item-right) [269.328125,8 522.65625x17.46875]
TextPaintable (TextNode<#text>)