1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 20:57:35 +00:00

LibWeb: Bring CSS line-height closer to other engines

This patch makes a few changes to the way we calculate line-height:

- `line-height: normal` is now resolved using metrics from the used
  font (specifically, round(A + D + lineGap)).

- `line-height: calc(...)` is now resolved at style compute time.

- `line-height` values are now absolutized at style compute time.

As a consequence of the above, we no longer need to walk the DOM
ancestor chain looking for line-heights during style computation.
Instead, values are inherited, resolved and absolutized locally.

This is not only much faster, but also makes our line-height metrics
match those of other engines like Gecko and Blink.
This commit is contained in:
Andreas Kling 2024-01-12 12:39:40 +01:00
parent f0722671c3
commit e7de5cb4d2
385 changed files with 6889 additions and 6893 deletions

View file

@ -3,72 +3,72 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x600 children: not-inline
Box <div.outer.row> at (8,8) content-size 150x150 flex-container(row) [FFC] children: not-inline
BlockContainer <div.inner> at (12.609375,8) content-size 30.078125x150 flex-item [BFC] children: inline
line 0 width: 30.078125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 4, rect: [12.609375,8 30.078125x17.46875]
line 0 width: 30.078125, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 4, rect: [12.609375,8 30.078125x17]
"Well"
TextNode <#text>
BlockContainer <div.inner> at (51.921875,8) content-size 36.84375x150 flex-item [BFC] children: inline
line 0 width: 36.84375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [51.921875,8 36.84375x17.46875]
line 0 width: 36.84375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 5, rect: [51.921875,8 36.84375x17]
"hello"
TextNode <#text>
BlockContainer <div.inner> at (98,8) content-size 55.359375x150 flex-item [BFC] children: inline
line 0 width: 55.359375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 7, rect: [98,8 55.359375x17.46875]
line 0 width: 55.359375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 7, rect: [98,8 55.359375x17]
"friends"
TextNode <#text>
BlockContainer <(anonymous)> at (8,158) content-size 784x0 children: inline
TextNode <#text>
Box <div.outer.row-reverse> at (8,158) content-size 150x150 flex-container(row-reverse) [FFC] children: not-inline
BlockContainer <div.inner> at (123.3125,158) content-size 30.078125x150 flex-item [BFC] children: inline
line 0 width: 30.078125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 4, rect: [123.3125,158 30.078125x17.46875]
line 0 width: 30.078125, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 4, rect: [123.3125,158 30.078125x17]
"Well"
TextNode <#text>
BlockContainer <div.inner> at (77.234375,158) content-size 36.84375x150 flex-item [BFC] children: inline
line 0 width: 36.84375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [77.234375,158 36.84375x17.46875]
line 0 width: 36.84375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 5, rect: [77.234375,158 36.84375x17]
"hello"
TextNode <#text>
BlockContainer <div.inner> at (12.640625,158) content-size 55.359375x150 flex-item [BFC] children: inline
line 0 width: 55.359375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 7, rect: [12.640625,158 55.359375x17.46875]
line 0 width: 55.359375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 7, rect: [12.640625,158 55.359375x17]
"friends"
TextNode <#text>
BlockContainer <(anonymous)> at (8,308) content-size 784x0 children: inline
TextNode <#text>
Box <div.outer.column> at (8,308) content-size 150x150 flex-container(column) [FFC] children: not-inline
BlockContainer <div.inner> at (8,324.265625) content-size 150x17.46875 flex-item [BFC] children: inline
line 0 width: 30.078125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 4, rect: [8,324.265625 30.078125x17.46875]
BlockContainer <div.inner> at (8,324.5) content-size 150x17 flex-item [BFC] children: inline
line 0 width: 30.078125, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 4, rect: [8,324.5 30.078125x17]
"Well"
TextNode <#text>
BlockContainer <div.inner> at (8,374.265625) content-size 150x17.46875 flex-item [BFC] children: inline
line 0 width: 36.84375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [8,374.265625 36.84375x17.46875]
BlockContainer <div.inner> at (8,374.5) content-size 150x17 flex-item [BFC] children: inline
line 0 width: 36.84375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 5, rect: [8,374.5 36.84375x17]
"hello"
TextNode <#text>
BlockContainer <div.inner> at (8,424.265625) content-size 150x17.46875 flex-item [BFC] children: inline
line 0 width: 55.359375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 7, rect: [8,424.265625 55.359375x17.46875]
BlockContainer <div.inner> at (8,424.5) content-size 150x17 flex-item [BFC] children: inline
line 0 width: 55.359375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 7, rect: [8,424.5 55.359375x17]
"friends"
TextNode <#text>
BlockContainer <(anonymous)> at (8,458) content-size 784x0 children: inline
TextNode <#text>
Box <div.outer.column-reverse> at (8,458) content-size 150x150 flex-container(column-reverse) [FFC] children: not-inline
BlockContainer <div.inner> at (8,574.265625) content-size 150x17.46875 flex-item [BFC] children: inline
line 0 width: 30.078125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 4, rect: [8,574.265625 30.078125x17.46875]
BlockContainer <div.inner> at (8,574.5) content-size 150x17 flex-item [BFC] children: inline
line 0 width: 30.078125, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 4, rect: [8,574.5 30.078125x17]
"Well"
TextNode <#text>
BlockContainer <div.inner> at (8,524.265625) content-size 150x17.46875 flex-item [BFC] children: inline
line 0 width: 36.84375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 5, rect: [8,524.265625 36.84375x17.46875]
BlockContainer <div.inner> at (8,524.5) content-size 150x17 flex-item [BFC] children: inline
line 0 width: 36.84375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 5, rect: [8,524.5 36.84375x17]
"hello"
TextNode <#text>
BlockContainer <div.inner> at (8,474.265625) content-size 150x17.46875 flex-item [BFC] children: inline
line 0 width: 55.359375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
frag 0 from TextNode start: 0, length: 7, rect: [8,474.265625 55.359375x17.46875]
BlockContainer <div.inner> at (8,474.5) content-size 150x17 flex-item [BFC] children: inline
line 0 width: 55.359375, height: 17, bottom: 17, baseline: 13.296875
frag 0 from TextNode start: 0, length: 7, rect: [8,474.5 55.359375x17]
"friends"
TextNode <#text>
@ -92,17 +92,17 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,308 784x0]
PaintableBox (Box<DIV>.outer.column) [8,308 150x150]
PaintableWithLines (BlockContainer<DIV>.inner) [8,324.265625 150x17.46875]
PaintableWithLines (BlockContainer<DIV>.inner) [8,324.5 150x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.inner) [8,374.265625 150x17.46875]
PaintableWithLines (BlockContainer<DIV>.inner) [8,374.5 150x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.inner) [8,424.265625 150x17.46875]
PaintableWithLines (BlockContainer<DIV>.inner) [8,424.5 150x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer(anonymous)) [8,458 784x0]
PaintableBox (Box<DIV>.outer.column-reverse) [8,458 150x150]
PaintableWithLines (BlockContainer<DIV>.inner) [8,574.265625 150x17.46875]
PaintableWithLines (BlockContainer<DIV>.inner) [8,574.5 150x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.inner) [8,524.265625 150x17.46875]
PaintableWithLines (BlockContainer<DIV>.inner) [8,524.5 150x17]
TextPaintable (TextNode<#text>)
PaintableWithLines (BlockContainer<DIV>.inner) [8,474.265625 150x17.46875]
PaintableWithLines (BlockContainer<DIV>.inner) [8,474.5 150x17]
TextPaintable (TextNode<#text>)