mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 06:57:45 +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
parent
f0722671c3
commit
e7de5cb4d2
385 changed files with 6889 additions and 6893 deletions
|
|
@ -1,47 +1,47 @@
|
|||
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 784x217.46875 children: not-inline
|
||||
BlockContainer <body> at (8,8) content-size 784x217 children: not-inline
|
||||
Box <div.grid-container> at (8,8) content-size 784x200 [GFC] children: not-inline
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (8,8) content-size 392x200 [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,8 6.34375x17.46875]
|
||||
line 0 width: 6.34375, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [8,8 6.34375x17]
|
||||
"1"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (400,8) content-size 392x100 [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]
|
||||
line 0 width: 8.8125, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [400,8 8.8125x17]
|
||||
"2"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (400,108) content-size 196x50 [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: [400,108 9.09375x17.46875]
|
||||
line 0 width: 9.09375, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [400,108 9.09375x17]
|
||||
"3"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (596,108) content-size 196x50 [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: [596,108 7.75x17.46875]
|
||||
line 0 width: 7.75, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [596,108 7.75x17]
|
||||
"4"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (400,158) content-size 196x50 [BFC] children: inline
|
||||
line 0 width: 8.453125, height: 17.46875, bottom: 17.46875, baseline: 13.53125
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [400,158 8.453125x17.46875]
|
||||
line 0 width: 8.453125, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [400,158 8.453125x17]
|
||||
"5"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (596,158) content-size 196x50 [BFC] children: inline
|
||||
line 0 width: 8.734375, height: 17.46875, bottom: 17.46875, baseline: 13.53125
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [596,158 8.734375x17.46875]
|
||||
line 0 width: 8.734375, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [596,158 8.734375x17]
|
||||
"6"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
|
|
@ -50,33 +50,33 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
|
|||
TextNode <#text>
|
||||
TextNode <#text>
|
||||
TextNode <#text>
|
||||
Box <div.grid-container> at (8,208) content-size 784x17.46875 [GFC] children: not-inline
|
||||
Box <div.grid-container> at (8,208) content-size 784x17 [GFC] children: not-inline
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (8,208) 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: [8,208 6.34375x17.46875]
|
||||
BlockContainer <div.grid-item> at (8,208) content-size 50x17 [BFC] children: inline
|
||||
line 0 width: 6.34375, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [8,208 6.34375x17]
|
||||
"1"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (58,208) content-size 50x17.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: [58,208 8.8125x17.46875]
|
||||
BlockContainer <div.grid-item> at (58,208) content-size 50x17 [BFC] children: inline
|
||||
line 0 width: 8.8125, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [58,208 8.8125x17]
|
||||
"2"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (108,208) content-size 100x17.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: [108,208 9.09375x17.46875]
|
||||
BlockContainer <div.grid-item> at (108,208) content-size 100x17 [BFC] children: inline
|
||||
line 0 width: 9.09375, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [108,208 9.09375x17]
|
||||
"3"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
TextNode <#text>
|
||||
BlockContainer <div.grid-item> at (208,208) 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: [208,208 7.75x17.46875]
|
||||
BlockContainer <div.grid-item> at (208,208) content-size 100x17 [BFC] children: inline
|
||||
line 0 width: 7.75, height: 17, bottom: 17, baseline: 13.296875
|
||||
frag 0 from TextNode start: 0, length: 1, rect: [208,208 7.75x17]
|
||||
"4"
|
||||
TextNode <#text>
|
||||
BlockContainer <(anonymous)> (not painted) [BFC] children: inline
|
||||
|
|
@ -84,7 +84,7 @@ 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 784x217.46875]
|
||||
PaintableWithLines (BlockContainer<BODY>) [8,8 784x217]
|
||||
PaintableBox (Box<DIV>.grid-container) [8,8 784x200]
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,8 392x200]
|
||||
TextPaintable (TextNode<#text>)
|
||||
|
|
@ -99,12 +99,12 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
|
|||
PaintableWithLines (BlockContainer<DIV>.grid-item) [596,158 196x50]
|
||||
TextPaintable (TextNode<#text>)
|
||||
PaintableWithLines (BlockContainer(anonymous)) [8,208 784x0]
|
||||
PaintableBox (Box<DIV>.grid-container) [8,208 784x17.46875]
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,208 50x17.46875]
|
||||
PaintableBox (Box<DIV>.grid-container) [8,208 784x17]
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [8,208 50x17]
|
||||
TextPaintable (TextNode<#text>)
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [58,208 50x17.46875]
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [58,208 50x17]
|
||||
TextPaintable (TextNode<#text>)
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [108,208 100x17.46875]
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [108,208 100x17]
|
||||
TextPaintable (TextNode<#text>)
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [208,208 100x17.46875]
|
||||
PaintableWithLines (BlockContainer<DIV>.grid-item) [208,208 100x17]
|
||||
TextPaintable (TextNode<#text>)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue