LibWeb: Peek after extracting next chunk in InlineLevelIterator

Peek is used to determine if the current chunk is
the last and if so, add trailing box metrics.
For this to work correctly, it must be done only
after calling next(), otherwise peek gives us the
current chunk.

Author: amhndu

Libraries/LibWeb/Layout/InlineLevelIterator.cpp

@@ -497,10 +497,11 @@ Optional<InlineLevelIterator::Item> InlineLevelIterator::next_without_lookahead(
         else
             m_text_node_context->is_first_chunk = false;
 
+        auto chunk_opt = m_text_node_context->chunk_iterator.next();
+
         if (!m_text_node_context->chunk_iterator.peek(0).has_value())
             m_text_node_context->is_last_chunk = true;
 
-        auto chunk_opt = m_text_node_context->chunk_iterator.next();
         auto is_empty_editable = false;
         if (!chunk_opt.has_value()) {
             auto const is_only_chunk = m_text_node_context->is_first_chunk && m_text_node_context->is_last_chunk;

Tests/LibWeb/Layout/expected/block-and-inline/inline-block-leading-and-trailing-metrics.txt

@@ -18,13 +18,13 @@ Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-
       BlockContainer <(anonymous)> at [8,28] [0+0+0 784 0+0+0] [0+0+0 0 0+0+0] children: inline
         TextNode <#text> (not painted)
       BlockContainer <div#b> at [9,29] [0+1+0 782 0+1+0] [0+1+0 18 0+1+0] children: inline
-        frag 0 from BlockContainer start: 0, length: 0, rect: [50.296875,29 88.453125x18] baseline: 13.796875
+        frag 0 from BlockContainer start: 0, length: 0, rect: [70.296875,29 88.453125x18] baseline: 13.796875
         InlineNode <i> at [9,29] [0+0+0 41.296875 20+0+0] [0+0+0 18 0+0+0]
           frag 0 from TextNode start: 0, length: 6, rect: [9,29 41.296875x18] baseline: 13.796875
               "inline"
           TextNode <#text> (not painted)
-        BlockContainer <b> at [50.296875,29] inline-block [0+0+0 88.453125 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline
-          frag 0 from TextNode start: 0, length: 12, rect: [50.296875,29 88.453125x18] baseline: 13.796875
+        BlockContainer <b> at [70.296875,29] inline-block [0+0+0 88.453125 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline
+          frag 0 from TextNode start: 0, length: 12, rect: [70.296875,29 88.453125x18] baseline: 13.796875
               "inline-block"
           TextNode <#text> (not painted)
         InlineNode <u> at [158.75,29] [0+0+0 41.296875 0+0+0] [0+0+0 18 0+0+0]
@@ -34,7 +34,7 @@ Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-
       BlockContainer <(anonymous)> at [8,48] [0+0+0 784 0+0+0] [0+0+0 0 0+0+0] children: inline
         TextNode <#text> (not painted)
       BlockContainer <div#c> at [9,49] [0+1+0 782 0+1+0] [0+1+0 18 0+1+0] children: inline
-        frag 0 from BlockContainer start: 0, length: 0, rect: [111.59375,49 88.453125x18] baseline: 13.796875
+        frag 0 from BlockContainer start: 0, length: 0, rect: [131.59375,49 88.453125x18] baseline: 13.796875
         InlineNode <i> at [9,49] [0+0+0 41.296875 0+0+0] [0+0+0 18 0+0+0]
           frag 0 from TextNode start: 0, length: 6, rect: [9,49 41.296875x18] baseline: 13.796875
               "inline"
@@ -43,8 +43,8 @@ Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-
           frag 0 from TextNode start: 0, length: 6, rect: [70.296875,49 41.296875x18] baseline: 13.796875
               "inline"
           TextNode <#text> (not painted)
-        BlockContainer <u> at [111.59375,49] inline-block [0+0+0 88.453125 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline
-          frag 0 from TextNode start: 0, length: 12, rect: [111.59375,49 88.453125x18] baseline: 13.796875
+        BlockContainer <u> at [131.59375,49] inline-block [0+0+0 88.453125 0+0+0] [0+0+0 18 0+0+0] [BFC] children: inline
+          frag 0 from TextNode start: 0, length: 12, rect: [131.59375,49 88.453125x18] baseline: 13.796875
               "inline-block"
           TextNode <#text> (not painted)
       BlockContainer <(anonymous)> at [8,68] [0+0+0 784 0+0+0] [0+0+0 0 0+0+0] children: inline
@@ -64,7 +64,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
       PaintableWithLines (BlockContainer<DIV>#b) [8,28 784x20]
         PaintableWithLines (InlineNode<I>) [9,29 61.296875x18]
           TextPaintable (TextNode<#text>)
-        PaintableWithLines (BlockContainer<B>) [50.296875,29 88.453125x18]
+        PaintableWithLines (BlockContainer<B>) [70.296875,29 88.453125x18]
           TextPaintable (TextNode<#text>)
         PaintableWithLines (InlineNode<U>) [158.75,29 41.296875x18]
           TextPaintable (TextNode<#text>)
@@ -74,7 +74,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
           TextPaintable (TextNode<#text>)
         PaintableWithLines (InlineNode<B>) [50.296875,49 81.296875x18]
           TextPaintable (TextNode<#text>)
-        PaintableWithLines (BlockContainer<U>) [111.59375,49 88.453125x18]
+        PaintableWithLines (BlockContainer<U>) [131.59375,49 88.453125x18]
           TextPaintable (TextNode<#text>)
       PaintableWithLines (BlockContainer(anonymous)) [8,68 784x0]
 

Tests/LibWeb/Layout/expected/block-and-inline/inline-text-margin.txt

@@ -0,0 +1,20 @@
+Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-inline
+  BlockContainer <html> at [0,0] [0+0+0 800 0+0+0] [0+0+0 34 0+0+0] [BFC] children: not-inline
+    BlockContainer <body> at [8,8] [8+0+0 784 0+0+8] [8+0+0 18 0+0+8] children: inline
+      frag 0 from TextNode start: 0, length: 2, rect: [60.15625,8 19.234375x18] baseline: 13.796875
+          "bu"
+      InlineNode <span#inline-margin> at [8,8] [0+0+0 27.15625 0+0+25] [0+0+0 18 0+0+0]
+        frag 0 from TextNode start: 0, length: 3, rect: [8,8 27.15625x18] baseline: 13.796875
+            "foo"
+        TextNode <#text> (not painted)
+      TextNode <#text> (not painted)
+
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
+  PaintableWithLines (BlockContainer<HTML>) [0,0 800x34]
+    PaintableWithLines (BlockContainer<BODY>) [8,8 784x18]
+      PaintableWithLines (InlineNode<SPAN>#inline-margin) [8,8 27.15625x18]
+        TextPaintable (TextNode<#text>)
+      TextPaintable (TextNode<#text>)
+
+SC for Viewport<#document> [0,0 800x600] [children: 1] (z-index: auto)
+ SC for BlockContainer<HTML> [0,0 800x34] [children: 0] (z-index: auto)

Tests/LibWeb/Layout/expected/block-and-inline/leading-margin-on-inline-content-that-starts-with-collapsible-whitespace.txt

@@ -5,8 +5,8 @@ Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-
         frag 0 from TextNode start: 1, length: 9, rect: [28,8 82.125x18] baseline: 13.796875
             "Download "
         TextNode <#text> (not painted)
-      InlineNode <div> at [130.125,8] [20+0+0 39.5625 0+0+20] [0+0+0 18 0+0+0]
-        frag 0 from TextNode start: 1, length: 4, rect: [130.125,8 39.5625x18] baseline: 13.796875
+      InlineNode <div> at [150.125,8] [20+0+0 39.5625 0+0+20] [0+0+0 18 0+0+0]
+        frag 0 from TextNode start: 1, length: 4, rect: [150.125,8 39.5625x18] baseline: 13.796875
             "News"
         TextNode <#text> (not painted)
       TextNode <#text> (not painted)
@@ -16,7 +16,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x18]
       PaintableWithLines (InlineNode<DIV>) [28,8 82.125x18]
         TextPaintable (TextNode<#text>)
-      PaintableWithLines (InlineNode<DIV>) [130.125,8 39.5625x18]
+      PaintableWithLines (InlineNode<DIV>) [150.125,8 39.5625x18]
         TextPaintable (TextNode<#text>)
 
 SC for Viewport<#document> [0,0 800x600] [children: 1] (z-index: auto)

Tests/LibWeb/Layout/expected/inline-nested-with-padding.txt

@@ -15,7 +15,7 @@ Viewport <#document> at [0,0] [0+0+0 800 0+0+0] [0+0+0 600 0+0+0] children: not-
           InlineNode <span.b> at [40,44] [0+0+30 130.109375 30+0+0] [0+0+0 18 0+0+0]
             frag 0 from TextNode start: 0, length: 2, rect: [40,44 20.515625x18] baseline: 13.796875
                 "wh"
-            frag 1 from TextNode start: 0, length: 1, rect: [133.671875,44 6.4375x18] baseline: 13.796875
+            frag 1 from TextNode start: 0, length: 1, rect: [163.671875,44 6.4375x18] baseline: 13.796875
                 "f"
             TextNode <#text> (not painted)
             InlineNode <span.b> at [90.515625,44] [0+0+30 43.15625 30+0+0] [0+0+0 18 0+0+0]

Tests/LibWeb/Layout/input/block-and-inline/inline-text-margin.html

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<style>
+    #inline-margin {
+        background-color: red;
+        margin-right: 25px;
+    }
+</style><span id="inline-margin">foo</span>bu