diff --git a/Libraries/LibWeb/Layout/BlockFormattingContext.cpp b/Libraries/LibWeb/Layout/BlockFormattingContext.cpp index 3794bf7ddfc..8600bb25349 100644 --- a/Libraries/LibWeb/Layout/BlockFormattingContext.cpp +++ b/Libraries/LibWeb/Layout/BlockFormattingContext.cpp @@ -1199,18 +1199,17 @@ void BlockFormattingContext::ensure_sizes_correct_for_left_offset_calculation(Li image_height = list_style_image->natural_height().value_or(0); } - auto default_marker_width = max(4, marker.first_available_font().pixel_size_rounded_up() - 4); - - auto marker_text = marker.text().value_or({}); - if (marker_text.is_empty()) { + auto marker_text = marker.text(); + if (!marker_text.has_value()) { + auto default_marker_width = max(4, marker.first_available_font().pixel_size() - 4); marker_state.set_content_width(image_width + default_marker_width); } else { // FIXME: Use per-code-point fonts to measure text. - auto text_width = marker.first_available_font().width(marker_text.code_points()); + auto text_width = marker.first_available_font().width(marker_text.value().code_points()); marker_state.set_content_width(image_width + CSSPixels::nearest_value_for(text_width)); } - marker_state.set_content_height(max(image_height, marker.first_available_font().pixel_size_rounded_up() + 1)); + marker_state.set_content_height(max(image_height, CSSPixels { marker.first_available_font().pixel_size() })); } void BlockFormattingContext::layout_list_item_marker(ListItemBox const& list_item_box, CSSPixels const& left_space_before_list_item_elements_formatted) @@ -1222,7 +1221,8 @@ void BlockFormattingContext::layout_list_item_marker(ListItemBox const& list_ite auto& marker_state = m_state.get_mutable(marker); auto& list_item_state = m_state.get_mutable(list_item_box); - auto default_marker_width = max(4, marker.first_available_font().pixel_size_rounded_up() - 4); + auto marker_text = marker.text(); + auto default_marker_width = marker_text.has_value() ? 0 : max(4, marker.first_available_font().pixel_size() - 4); auto final_marker_width = marker_state.content_width() + default_marker_width; if (marker.list_style_position() == CSS::ListStylePosition::Inside) { @@ -1232,7 +1232,7 @@ void BlockFormattingContext::layout_list_item_marker(ListItemBox const& list_ite auto offset_y = max(CSSPixels(0), (marker.computed_values().line_height() - marker_state.content_height()) / 2); - marker_state.set_content_offset({ left_space_before_list_item_elements_formatted - final_marker_width, offset_y }); + marker_state.set_content_offset({ left_space_before_list_item_elements_formatted - final_marker_width, round(offset_y) }); if (marker_state.content_height() > list_item_state.content_height()) list_item_state.set_content_height(marker_state.content_height()); diff --git a/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp b/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp index 4701c5b0a17..2ece586ea52 100644 --- a/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp +++ b/Libraries/LibWeb/Layout/ListItemMarkerBox.cpp @@ -28,33 +28,40 @@ Optional ListItemMarkerBox::text() const return m_list_style_type.visit( [index](CSS::CounterStyleNameKeyword keyword) -> Optional { + String text; switch (keyword) { case CSS::CounterStyleNameKeyword::Square: case CSS::CounterStyleNameKeyword::Circle: case CSS::CounterStyleNameKeyword::Disc: case CSS::CounterStyleNameKeyword::DisclosureClosed: case CSS::CounterStyleNameKeyword::DisclosureOpen: - return {}; - case CSS::CounterStyleNameKeyword::Decimal: - return MUST(String::formatted("{}.", index)); - case CSS::CounterStyleNameKeyword::DecimalLeadingZero: - // This is weird, but in accordance to spec. - return MUST(index < 10 ? String::formatted("0{}.", index) : String::formatted("{}.", index)); - case CSS::CounterStyleNameKeyword::LowerAlpha: - case CSS::CounterStyleNameKeyword::LowerLatin: - return String::bijective_base_from(index - 1, String::Case::Lower); - case CSS::CounterStyleNameKeyword::UpperAlpha: - case CSS::CounterStyleNameKeyword::UpperLatin: - return String::bijective_base_from(index - 1, String::Case::Upper); - case CSS::CounterStyleNameKeyword::LowerRoman: - return String::roman_number_from(index, String::Case::Lower); - case CSS::CounterStyleNameKeyword::UpperRoman: - return String::roman_number_from(index, String::Case::Upper); case CSS::CounterStyleNameKeyword::None: return {}; + case CSS::CounterStyleNameKeyword::Decimal: + text = String::number(index); + break; + case CSS::CounterStyleNameKeyword::DecimalLeadingZero: + // This is weird, but in accordance to spec. + text = index < 10 ? MUST(String::formatted("0{}", index)) : String::number(index); + break; + case CSS::CounterStyleNameKeyword::LowerAlpha: + case CSS::CounterStyleNameKeyword::LowerLatin: + text = String::bijective_base_from(index - 1, String::Case::Lower); + break; + case CSS::CounterStyleNameKeyword::UpperAlpha: + case CSS::CounterStyleNameKeyword::UpperLatin: + text = String::bijective_base_from(index - 1, String::Case::Upper); + break; + case CSS::CounterStyleNameKeyword::LowerRoman: + text = String::roman_number_from(index, String::Case::Lower); + break; + case CSS::CounterStyleNameKeyword::UpperRoman: + text = String::roman_number_from(index, String::Case::Upper); + break; default: VERIFY_NOT_REACHED(); } + return MUST(String::formatted("{}. ", text)); }, [](String const& string) -> Optional { return string; diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/list-markers-intruded-by-float.txt b/Tests/LibWeb/Layout/expected/block-and-inline/list-markers-intruded-by-float.txt index e005a4dab45..a0e769f9668 100644 --- a/Tests/LibWeb/Layout/expected/block-and-inline/list-markers-intruded-by-float.txt +++ b/Tests/LibWeb/Layout/expected/block-and-inline/list-markers-intruded-by-float.txt @@ -6,32 +6,32 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
  • at (48,16) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 1, rect: [328,16 9.34375x18] baseline: 13.796875 "a" - ListItemMarkerBox <(anonymous)> at (304,16.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (304,17) content-size 12x16 children: not-inline TextNode <#text> ListItemBox
  • at (48,34) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 1, rect: [328,34 9.34375x18] baseline: 13.796875 "a" - ListItemMarkerBox <(anonymous)> at (304,34.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (304,35) content-size 12x16 children: not-inline TextNode <#text> ListItemBox
  • at (48,52) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 1, rect: [328,52 9.34375x18] baseline: 13.796875 "a" - ListItemMarkerBox <(anonymous)> at (304,52.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (304,53) content-size 12x16 children: not-inline TextNode <#text> ListItemBox
  • at (48,70) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 1, rect: [328,70 9.34375x18] baseline: 13.796875 "a" - ListItemMarkerBox <(anonymous)> at (304,70.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (304,71) content-size 12x16 children: not-inline TextNode <#text> ListItemBox
  • at (48,88) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 1, rect: [328,88 9.34375x18] baseline: 13.796875 "a" - ListItemMarkerBox <(anonymous)> at (304,88.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (304,89) content-size 12x16 children: not-inline TextNode <#text> ListItemBox
  • at (48,106) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 1, rect: [328,106 9.34375x18] baseline: 13.796875 "a" - ListItemMarkerBox <(anonymous)> at (304,106.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (304,107) content-size 12x16 children: not-inline TextNode <#text> ViewportPaintable (Viewport<#document>) [0,0 800x600] @@ -40,22 +40,22 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
    .box) [8,16 220x120] PaintableWithLines (BlockContainer
      ) [8,16 784x108] PaintableWithLines (ListItemBox
    • ) [48,16 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [304,16.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [304,17 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
    • ) [48,34 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [304,34.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [304,35 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
    • ) [48,52 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [304,52.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [304,53 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
    • ) [48,70 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [304,70.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [304,71 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
    • ) [48,88 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [304,88.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [304,89 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
    • ) [48,106 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [304,106.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [304,107 12x16] TextPaintable (TextNode<#text>) SC for Viewport<#document> [0,0 800x600] [children: 1] (z-index: auto) diff --git a/Tests/LibWeb/Layout/expected/css-pseudo-element-display-list-item.txt b/Tests/LibWeb/Layout/expected/css-pseudo-element-display-list-item.txt index 9e18b30e4ff..8a1182bb71c 100644 --- a/Tests/LibWeb/Layout/expected/css-pseudo-element-display-list-item.txt +++ b/Tests/LibWeb/Layout/expected/css-pseudo-element-display-list-item.txt @@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox <(anonymous)> at (24,26) content-size 768x18 children: inline frag 0 from TextNode start: 0, length: 11, rect: [24,26 88.703125x18] baseline: 13.796875 "Filler Text" - ListItemMarkerBox <(anonymous)> at (0,26.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (0,27) content-size 12x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,44) content-size 784x0 children: inline TextNode <#text> @@ -21,7 +21,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer(anonymous)) [8,8 784x18] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox(anonymous)) [24,26 768x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [0,26.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [0,27 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [8,44 784x0] diff --git a/Tests/LibWeb/Layout/expected/details-closed.txt b/Tests/LibWeb/Layout/expected/details-closed.txt index a4aec9bec22..bb7bb9b63a8 100644 --- a/Tests/LibWeb/Layout/expected/details-closed.txt +++ b/Tests/LibWeb/Layout/expected/details-closed.txt @@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox at (32,8) content-size 760x18 children: inline frag 0 from TextNode start: 0, length: 13, rect: [32,8 114.625x18] baseline: 13.796875 "I'm a summary" - ListItemMarkerBox <(anonymous)> at (8,8.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (8,9) content-size 12x16 children: not-inline TextNode <#text> BlockContainer at (8,26) content-size 784x0 children: not-inline BlockContainer <(anonymous)> at (8,26) content-size 784x0 children: inline @@ -16,7 +16,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer) [8,8 784x18] PaintableWithLines (BlockContainer
      ) [8,8 784x18] PaintableWithLines (ListItemBox) [32,8 760x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [8,8.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [8,9 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer) [8,26 784x0] PaintableWithLines (BlockContainer(anonymous)) [8,26 784x0] diff --git a/Tests/LibWeb/Layout/expected/details-open.txt b/Tests/LibWeb/Layout/expected/details-open.txt index 86979a522e3..58dcded5432 100644 --- a/Tests/LibWeb/Layout/expected/details-open.txt +++ b/Tests/LibWeb/Layout/expected/details-open.txt @@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox at (32,8) content-size 760x18 children: inline frag 0 from TextNode start: 0, length: 13, rect: [32,8 114.625x18] baseline: 13.796875 "I'm a summary" - ListItemMarkerBox <(anonymous)> at (8,8.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (8,9) content-size 12x16 children: not-inline TextNode <#text> BlockContainer at (8,26) content-size 784x18 children: inline TextNode <#text> @@ -23,7 +23,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer) [8,8 784x36] PaintableWithLines (BlockContainer
      ) [8,8 784x36] PaintableWithLines (ListItemBox) [32,8 760x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [8,8.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [8,9 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer) [8,26 784x18] PaintableWithLines (InlineNode) [8,26 82.3125x18] diff --git a/Tests/LibWeb/Layout/expected/details-summary-default-ua-style.txt b/Tests/LibWeb/Layout/expected/details-summary-default-ua-style.txt index de70ae286cb..bcb14560292 100644 --- a/Tests/LibWeb/Layout/expected/details-summary-default-ua-style.txt +++ b/Tests/LibWeb/Layout/expected/details-summary-default-ua-style.txt @@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox at (92,68) content-size 640x18 children: inline frag 0 from TextNode start: 0, length: 5, rect: [92,68 36.84375x18] baseline: 13.796875 "hello" - ListItemMarkerBox <(anonymous)> at (68,68.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (68,69) content-size 12x16 children: not-inline TextNode <#text> BlockContainer at (68,86) content-size 664x0 children: not-inline @@ -14,7 +14,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer) [8,8 784x138] PaintableWithLines (BlockContainer
      ) [8,8 784x138] PaintableWithLines (ListItemBox) [92,68 640x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [68,68.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [68,69 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer) [68,86 664x0] diff --git a/Tests/LibWeb/Layout/expected/inside-list-item-content-offset.txt b/Tests/LibWeb/Layout/expected/inside-list-item-content-offset.txt index 7d4b1be604c..c892562e50f 100644 --- a/Tests/LibWeb/Layout/expected/inside-list-item-content-offset.txt +++ b/Tests/LibWeb/Layout/expected/inside-list-item-content-offset.txt @@ -1,17 +1,17 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline - BlockContainer at (0,0) content-size 800x417 [BFC] children: not-inline - BlockContainer at (8,200) content-size 784x17 children: not-inline - ListItemBox at (232,200) content-size 360x17 children: not-inline - ListItemMarkerBox <(anonymous)> at (208,200.5) content-size 12x17 children: not-inline + BlockContainer at (0,0) content-size 800x416 [BFC] children: not-inline + BlockContainer at (8,200) content-size 784x16 children: not-inline + ListItemBox at (232,200) content-size 360x16 children: not-inline + ListItemMarkerBox <(anonymous)> at (208,201) content-size 12x16 children: not-inline BlockContainer <(anonymous)> at (8,400) content-size 784x0 children: inline TextNode <#text> ViewportPaintable (Viewport<#document>) [0,0 800x600] - PaintableWithLines (BlockContainer) [0,0 800x417] - PaintableWithLines (BlockContainer) [8,200 784x17] overflow: [8,200 784x17.5] - PaintableWithLines (ListItemBox) [232,200 360x17] overflow: [232,200 360x17.5] - MarkerPaintable (ListItemMarkerBox(anonymous)) [208,200.5 12x17] + PaintableWithLines (BlockContainer) [0,0 800x416] + PaintableWithLines (BlockContainer) [8,200 784x16] overflow: [8,200 784x17] + PaintableWithLines (ListItemBox) [232,200 360x16] overflow: [232,200 360x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [208,201 12x16] PaintableWithLines (BlockContainer(anonymous)) [8,400 784x0] SC for Viewport<#document> [0,0 800x600] [children: 1] (z-index: auto) - SC for BlockContainer [0,0 800x417] [children: 0] (z-index: auto) + SC for BlockContainer [0,0 800x416] [children: 0] (z-index: auto) diff --git a/Tests/LibWeb/Layout/expected/list-item-marker-pseudo-placement.txt b/Tests/LibWeb/Layout/expected/list-item-marker-pseudo-placement.txt index 71a50953f0c..83df5dc682f 100644 --- a/Tests/LibWeb/Layout/expected/list-item-marker-pseudo-placement.txt +++ b/Tests/LibWeb/Layout/expected/list-item-marker-pseudo-placement.txt @@ -2,7 +2,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline BlockContainer at (0,0) content-size 800x52 [BFC] children: not-inline BlockContainer at (8,8) content-size 784x36 children: not-inline ListItemBox at (8,8) content-size 784x36 children: not-inline - ListItemMarkerBox <(anonymous)> at (-16,8.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-16,9) content-size 12x16 children: not-inline BlockContainer <(anonymous)> at (8,8) content-size 784x18 children: inline InlineNode <(anonymous)> frag 0 from TextNode start: 0, length: 6, rect: [8,8 52.53125x18] baseline: 13.796875 @@ -21,7 +21,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer) [0,0 800x52] PaintableWithLines (BlockContainer) [8,8 784x36] PaintableWithLines (ListItemBox) [8,8 784x36] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-16,8.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-16,9 12x16] PaintableWithLines (BlockContainer(anonymous)) [8,8 784x18] PaintableWithLines (InlineNode(anonymous)) [8,8 52.53125x18] TextPaintable (TextNode<#text>) diff --git a/Tests/LibWeb/Layout/expected/list-render-list-owner-is-document.txt b/Tests/LibWeb/Layout/expected/list-render-list-owner-is-document.txt index 541e4a276e2..3b41e095db5 100644 --- a/Tests/LibWeb/Layout/expected/list-render-list-owner-is-document.txt +++ b/Tests/LibWeb/Layout/expected/list-render-list-owner-is-document.txt @@ -8,14 +8,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
    • at (8,8) content-size 784x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [8,8 29.8125x18] baseline: 13.796875 "One" - ListItemMarkerBox <(anonymous)> at (-14.6875,8.5) content-size 10.6875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-10.6875,9) content-size 18.6875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,26) content-size 784x0 children: inline TextNode <#text> ListItemBox
    • at (8,26) content-size 784x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [8,26 33.875x18] baseline: 13.796875 "Two" - ListItemMarkerBox <(anonymous)> at (-17.15625,26.5) content-size 13.15625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-13.15625,27) content-size 21.15625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,44) content-size 784x0 children: inline TextNode <#text> @@ -26,11 +26,11 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer) [8,8 784x36] PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0] PaintableWithLines (ListItemBox
    • ) [8,8 784x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-14.6875,8.5 10.6875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-10.6875,9 18.6875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [8,26 784x0] PaintableWithLines (ListItemBox
    • ) [8,26 784x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-17.15625,26.5 13.15625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-13.15625,27 21.15625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [8,44 784x0] diff --git a/Tests/LibWeb/Layout/expected/list-render-list-owner-not-ol.txt b/Tests/LibWeb/Layout/expected/list-render-list-owner-not-ol.txt index e27076adf8c..522dc14b7be 100644 --- a/Tests/LibWeb/Layout/expected/list-render-list-owner-not-ol.txt +++ b/Tests/LibWeb/Layout/expected/list-render-list-owner-not-ol.txt @@ -9,14 +9,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
    • at (8,8) content-size 784x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [8,8 29.8125x18] baseline: 13.796875 "One" - ListItemMarkerBox <(anonymous)> at (-14.6875,8.5) content-size 10.6875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-10.6875,9) content-size 18.6875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,26) content-size 784x0 children: inline TextNode <#text> ListItemBox
    • at (8,26) content-size 784x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [8,26 33.875x18] baseline: 13.796875 "Two" - ListItemMarkerBox <(anonymous)> at (-17.15625,26.5) content-size 13.15625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-13.15625,27) content-size 21.15625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (8,44) content-size 784x0 children: inline TextNode <#text> @@ -30,11 +30,11 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
      #list-item-owner) [8,8 784x36] PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0] PaintableWithLines (ListItemBox
    • ) [8,8 784x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-14.6875,8.5 10.6875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-10.6875,9 18.6875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [8,26 784x0] PaintableWithLines (ListItemBox
    • ) [8,26 784x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-17.15625,26.5 13.15625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-13.15625,27 21.15625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [8,44 784x0] PaintableWithLines (BlockContainer(anonymous)) [8,44 784x0] diff --git a/Tests/LibWeb/Layout/expected/list-render-no-list.txt b/Tests/LibWeb/Layout/expected/list-render-no-list.txt index 3fa648f6cc8..09f405d55a3 100644 --- a/Tests/LibWeb/Layout/expected/list-render-no-list.txt +++ b/Tests/LibWeb/Layout/expected/list-render-no-list.txt @@ -6,12 +6,12 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
    • at (8,8) content-size 784x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [8,8 29.8125x18] baseline: 13.796875 "One" - ListItemMarkerBox <(anonymous)> at (-16,8.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-16,9) content-size 12x16 children: not-inline TextNode <#text> ListItemBox
    • at (8,26) content-size 784x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [8,26 33.875x18] baseline: 13.796875 "Two" - ListItemMarkerBox <(anonymous)> at (-16,26.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (-16,27) content-size 12x16 children: not-inline TextNode <#text> ViewportPaintable (Viewport<#document>) [0,0 800x600] @@ -19,10 +19,10 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer) [8,8 784x36] PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0] PaintableWithLines (ListItemBox
    • ) [8,8 784x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-16,8.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-16,9 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
    • ) [8,26 784x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-16,26.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [-16,27 12x16] TextPaintable (TextNode<#text>) SC for Viewport<#document> [0,0 800x600] [children: 1] (z-index: auto) diff --git a/Tests/LibWeb/Layout/expected/ol-render-deep-hybrid-list-item-list.txt b/Tests/LibWeb/Layout/expected/ol-render-deep-hybrid-list-item-list.txt index 2bdb041150f..64034a0fd9e 100644 --- a/Tests/LibWeb/Layout/expected/ol-render-deep-hybrid-list-item-list.txt +++ b/Tests/LibWeb/Layout/expected/ol-render-deep-hybrid-list-item-list.txt @@ -7,14 +7,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
    • at (48,16) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [48,16 29.8125x18] baseline: 13.796875 "One" - ListItemMarkerBox <(anonymous)> at (25.3125,16.5) content-size 10.6875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (29.3125,17) content-size 18.6875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,34) content-size 744x0 children: inline TextNode <#text> ListItemBox
    • at (48,34) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 10, rect: [48,34 90.796875x18] baseline: 13.796875 "Twenty-two" - ListItemMarkerBox <(anonymous)> at (14.03125,34.5) content-size 21.96875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.03125,35) content-size 29.96875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,52) content-size 744x0 children: inline TextNode <#text> @@ -42,7 +42,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
      at (48,124) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 12, rect: [48,124 104.78125x18] baseline: 13.796875 "Twenty-three" - ListItemMarkerBox <(anonymous)> at (13.75,124.5) content-size 22.25x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (17.75,125) content-size 30.25x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,142) content-size 744x0 children: inline TextNode <#text> @@ -70,7 +70,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
    • at (48,226) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 11, rect: [48,226 97.75x18] baseline: 13.796875 "Twenty-four" - ListItemMarkerBox <(anonymous)> at (15.09375,226.5) content-size 20.90625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (19.09375,227) content-size 28.90625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,244) content-size 744x0 children: inline TextNode <#text> @@ -87,7 +87,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox

      at (48,296) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 11, rect: [48,296 90.28125x18] baseline: 13.796875 "Twenty-five" - ListItemMarkerBox <(anonymous)> at (14.390625,296.5) content-size 21.609375x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.390625,297) content-size 29.609375x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,330) content-size 744x0 children: inline TextNode <#text> @@ -96,21 +96,21 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox

    • at (48,330) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 10, rect: [48,330 85.96875x18] baseline: 13.796875 "Twenty-six" - ListItemMarkerBox <(anonymous)> at (14.109375,330.5) content-size 21.890625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.109375,331) content-size 29.890625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,348) content-size 744x0 children: inline TextNode <#text> ListItemBox at (48,348) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 12, rect: [48,348 106.953125x18] baseline: 13.796875 "Twenty-seven" - ListItemMarkerBox <(anonymous)> at (14.125,348.5) content-size 21.875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.125,349) content-size 29.875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,366) content-size 744x0 children: inline TextNode <#text> ListItemBox
    • at (48,366) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 12, rect: [48,366 99.359375x18] baseline: 13.796875 "Twenty-eight" - ListItemMarkerBox <(anonymous)> at (13.359375,366.5) content-size 22.640625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (17.359375,367) content-size 30.640625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,384) content-size 744x0 children: inline TextNode <#text> @@ -123,11 +123,11 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
        ) [8,16 784x368] PaintableWithLines (BlockContainer(anonymous)) [48,16 744x0] PaintableWithLines (ListItemBox
      1. ) [48,16 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [25.3125,16.5 10.6875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [29.3125,17 18.6875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,34 744x0] PaintableWithLines (ListItemBox
      2. ) [48,34 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.03125,34.5 21.96875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.03125,35 29.96875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,52 744x0] PaintableWithLines (BlockContainer
        ) [48,52 744x18] @@ -143,7 +143,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer(anonymous)) [48,106 744x18] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
        ) [48,124 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [13.75,124.5 22.25x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [17.75,125 30.25x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,142 744x0] PaintableWithLines (BlockContainer(anonymous)) [48,142 744x0] @@ -158,7 +158,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (InlineNode) [70.65625,192 12.609375x18] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox
      3. ) [48,226 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [15.09375,226.5 20.90625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [19.09375,227 28.90625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,244 744x0] PaintableWithLines (BlockContainer
        ) [48,244 744x70] @@ -168,20 +168,20 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer(anonymous)) [48,262 744x18] TextPaintable (TextNode<#text>) PaintableWithLines (ListItemBox

        ) [48,296 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.390625,296.5 21.609375x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.390625,297 29.609375x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,330 744x0] PaintableWithLines (BlockContainer(anonymous)) [48,330 744x0] PaintableWithLines (ListItemBox

      4. ) [48,330 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.109375,330.5 21.890625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.109375,331 29.890625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,348 744x0] PaintableWithLines (ListItemBox) [48,348 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.125,348.5 21.875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.125,349 29.875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,366 744x0] PaintableWithLines (ListItemBox
      5. ) [48,366 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [13.359375,366.5 22.640625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [17.359375,367 30.640625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,384 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,400 784x0] diff --git a/Tests/LibWeb/Layout/expected/ol-render-item-values.txt b/Tests/LibWeb/Layout/expected/ol-render-item-values.txt index 5c325c9f4b3..c052e3b4d82 100644 --- a/Tests/LibWeb/Layout/expected/ol-render-item-values.txt +++ b/Tests/LibWeb/Layout/expected/ol-render-item-values.txt @@ -9,14 +9,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
      6. at (48,16) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 5, rect: [48,16 47.21875x18] baseline: 13.796875 "Seven" - ListItemMarkerBox <(anonymous)> at (22.9375,16.5) content-size 13.0625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (26.9375,17) content-size 21.0625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,34) content-size 744x0 children: inline TextNode <#text> ListItemBox
      7. at (48,34) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 28, rect: [48,34 242.4375x18] baseline: 13.796875 "Minus one hundred and twelve" - ListItemMarkerBox <(anonymous)> at (3.671875,34.5) content-size 32.328125x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (7.671875,35) content-size 40.328125x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,52) content-size 744x0 children: inline TextNode <#text> @@ -24,14 +24,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
      8. at (48,52) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 23, rect: [48,52 206.5x18] baseline: 13.796875 "Two to the power of ten" - ListItemMarkerBox <(anonymous)> at (-0.84375,52.5) content-size 36.84375x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (3.15625,53) content-size 44.84375x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,70) content-size 744x0 children: inline TextNode <#text> ListItemBox
      9. at (48,70) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 6, rect: [48,70 51.34375x18] baseline: 13.796875 "Eleven" - ListItemMarkerBox <(anonymous)> at (18.96875,70.5) content-size 17.03125x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (22.96875,71) content-size 25.03125x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,88) content-size 744x0 children: inline TextNode <#text> @@ -45,19 +45,19 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
          ) [8,16 784x72] PaintableWithLines (BlockContainer(anonymous)) [48,16 744x0] PaintableWithLines (ListItemBox
        1. ) [48,16 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [22.9375,16.5 13.0625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [26.9375,17 21.0625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,34 744x0] PaintableWithLines (ListItemBox
        2. ) [48,34 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [3.671875,34.5 32.328125x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [7.671875,35 40.328125x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,52 744x0] PaintableWithLines (ListItemBox
        3. ) [48,52 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [-0.84375,52.5 36.84375x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [3.15625,53 44.84375x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,70 744x0] PaintableWithLines (ListItemBox
        4. ) [48,70 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [18.96875,70.5 17.03125x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [22.96875,71 25.03125x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,88 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,104 784x0] diff --git a/Tests/LibWeb/Layout/expected/ol-render-style-list-item.txt b/Tests/LibWeb/Layout/expected/ol-render-style-list-item.txt index 5b83215d877..418bea2a7bd 100644 --- a/Tests/LibWeb/Layout/expected/ol-render-style-list-item.txt +++ b/Tests/LibWeb/Layout/expected/ol-render-style-list-item.txt @@ -7,56 +7,56 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
        5. at (48,16) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [48,16 29.8125x18] baseline: 13.796875 "One" - ListItemMarkerBox <(anonymous)> at (25.3125,16.5) content-size 10.6875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (29.3125,17) content-size 18.6875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,34) content-size 744x0 children: inline TextNode <#text> ListItemBox
        6. at (48,34) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 10, rect: [48,34 90.796875x18] baseline: 13.796875 "Twenty-two" - ListItemMarkerBox <(anonymous)> at (14.03125,34.5) content-size 21.96875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.03125,35) content-size 29.96875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,52) content-size 744x0 children: inline TextNode <#text> ListItemBox
          at (48,52) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 12, rect: [48,52 104.78125x18] baseline: 13.796875 "Twenty-three" - ListItemMarkerBox <(anonymous)> at (13.75,52.5) content-size 22.25x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (17.75,53) content-size 30.25x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,70) content-size 744x0 children: inline TextNode <#text> ListItemBox
        7. at (48,70) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 11, rect: [48,70 97.75x18] baseline: 13.796875 "Twenty-four" - ListItemMarkerBox <(anonymous)> at (15.09375,70.5) content-size 20.90625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (19.09375,71) content-size 28.90625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,88) content-size 744x0 children: inline TextNode <#text> ListItemBox

          at (48,104) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 11, rect: [48,104 90.28125x18] baseline: 13.796875 "Twenty-five" - ListItemMarkerBox <(anonymous)> at (14.390625,104.5) content-size 21.609375x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.390625,105) content-size 29.609375x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,138) content-size 744x0 children: inline TextNode <#text> ListItemBox

        8. at (48,138) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 10, rect: [48,138 85.96875x18] baseline: 13.796875 "Twenty-six" - ListItemMarkerBox <(anonymous)> at (14.109375,138.5) content-size 21.890625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.109375,139) content-size 29.890625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,156) content-size 744x0 children: inline TextNode <#text> ListItemBox at (48,156) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 12, rect: [48,156 106.953125x18] baseline: 13.796875 "Twenty-seven" - ListItemMarkerBox <(anonymous)> at (14.125,156.5) content-size 21.875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.125,157) content-size 29.875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,174) content-size 744x0 children: inline TextNode <#text> ListItemBox
        9. at (48,174) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 12, rect: [48,174 99.359375x18] baseline: 13.796875 "Twenty-eight" - ListItemMarkerBox <(anonymous)> at (13.359375,174.5) content-size 22.640625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (17.359375,175) content-size 30.640625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,192) content-size 744x0 children: inline TextNode <#text> @@ -69,35 +69,35 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
            ) [8,16 784x176] PaintableWithLines (BlockContainer(anonymous)) [48,16 744x0] PaintableWithLines (ListItemBox
          1. ) [48,16 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [25.3125,16.5 10.6875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [29.3125,17 18.6875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,34 744x0] PaintableWithLines (ListItemBox
          2. ) [48,34 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.03125,34.5 21.96875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.03125,35 29.96875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,52 744x0] PaintableWithLines (ListItemBox
            ) [48,52 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [13.75,52.5 22.25x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [17.75,53 30.25x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,70 744x0] PaintableWithLines (ListItemBox
          3. ) [48,70 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [15.09375,70.5 20.90625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [19.09375,71 28.90625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,88 744x0] PaintableWithLines (ListItemBox

            ) [48,104 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.390625,104.5 21.609375x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.390625,105 29.609375x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,138 744x0] PaintableWithLines (ListItemBox

          4. ) [48,138 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.109375,138.5 21.890625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.109375,139 29.890625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,156 744x0] PaintableWithLines (ListItemBox) [48,156 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.125,156.5 21.875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.125,157 29.875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,174 744x0] PaintableWithLines (ListItemBox
          5. ) [48,174 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [13.359375,174.5 22.640625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [17.359375,175 30.640625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,192 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,208 784x0] diff --git a/Tests/LibWeb/Layout/expected/ordered-list.txt b/Tests/LibWeb/Layout/expected/ordered-list.txt index 80070bad75f..cc7b3df3693 100644 --- a/Tests/LibWeb/Layout/expected/ordered-list.txt +++ b/Tests/LibWeb/Layout/expected/ordered-list.txt @@ -7,21 +7,21 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
          6. at (48,16) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 7, rect: [48,16 58.78125x18] baseline: 13.796875 "Item 20" - ListItemMarkerBox <(anonymous)> at (13.25,16.5) content-size 22.75x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (17.25,17) content-size 30.75x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,34) content-size 744x0 children: inline TextNode <#text> ListItemBox
          7. at (48,34) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 7, rect: [48,34 55.53125x18] baseline: 13.796875 "Item 21" - ListItemMarkerBox <(anonymous)> at (16.5,34.5) content-size 19.5x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (20.5,35) content-size 27.5x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,52) content-size 744x0 children: inline TextNode <#text> ListItemBox
          8. at (48,52) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 7, rect: [48,52 58x18] baseline: 13.796875 "Item 22" - ListItemMarkerBox <(anonymous)> at (14.03125,52.5) content-size 21.96875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (18.03125,53) content-size 29.96875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,70) content-size 744x0 children: inline TextNode <#text> @@ -33,28 +33,28 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
          9. at (48,86) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 6, rect: [48,86 46.71875x18] baseline: 13.796875 "Item 1" - ListItemMarkerBox <(anonymous)> at (25.3125,86.5) content-size 10.6875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (29.3125,87) content-size 18.6875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,104) content-size 744x0 children: inline TextNode <#text> ListItemBox
          10. at (48,104) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 6, rect: [48,104 48.828125x18] baseline: 13.796875 "Item 5" - ListItemMarkerBox <(anonymous)> at (23.203125,104.5) content-size 12.796875x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (27.203125,105) content-size 20.796875x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,122) content-size 744x0 children: inline TextNode <#text> ListItemBox
          11. at (48,122) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 6, rect: [48,122 49.109375x18] baseline: 13.796875 "Item 6" - ListItemMarkerBox <(anonymous)> at (22.921875,122.5) content-size 13.078125x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (26.921875,123) content-size 21.078125x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,140) content-size 744x0 children: inline TextNode <#text> ListItemBox
          12. at (48,140) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 6, rect: [48,140 49.09375x18] baseline: 13.796875 "Item 7" - ListItemMarkerBox <(anonymous)> at (22.9375,140.5) content-size 13.0625x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (26.9375,141) content-size 21.0625x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,158) content-size 744x0 children: inline TextNode <#text> @@ -67,34 +67,34 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
              ) [8,16 784x54] PaintableWithLines (BlockContainer(anonymous)) [48,16 744x0] PaintableWithLines (ListItemBox
            1. ) [48,16 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [13.25,16.5 22.75x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [17.25,17 30.75x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,34 744x0] PaintableWithLines (ListItemBox
            2. ) [48,34 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [16.5,34.5 19.5x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [20.5,35 27.5x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,52 744x0] PaintableWithLines (ListItemBox
            3. ) [48,52 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [14.03125,52.5 21.96875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [18.03125,53 29.96875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,70 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,86 784x0] PaintableWithLines (BlockContainer
                ) [8,86 784x72] PaintableWithLines (BlockContainer(anonymous)) [48,86 744x0] PaintableWithLines (ListItemBox
              1. ) [48,86 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [25.3125,86.5 10.6875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [29.3125,87 18.6875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,104 744x0] PaintableWithLines (ListItemBox
              2. ) [48,104 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [23.203125,104.5 12.796875x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [27.203125,105 20.796875x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,122 744x0] PaintableWithLines (ListItemBox
              3. ) [48,122 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [22.921875,122.5 13.078125x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [26.921875,123 21.078125x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,140 744x0] PaintableWithLines (ListItemBox
              4. ) [48,140 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [22.9375,140.5 13.0625x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [26.9375,141 21.0625x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,158 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,174 784x0] diff --git a/Tests/LibWeb/Layout/expected/ul-render.txt b/Tests/LibWeb/Layout/expected/ul-render.txt index d44cef26e0a..80b315556f8 100644 --- a/Tests/LibWeb/Layout/expected/ul-render.txt +++ b/Tests/LibWeb/Layout/expected/ul-render.txt @@ -11,14 +11,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
              5. at (48,16) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 5, rect: [48,16 47.859375x18] baseline: 13.796875 "Three" - ListItemMarkerBox <(anonymous)> at (24,16.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (24,17) content-size 12x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,34) content-size 744x0 children: inline TextNode <#text> ListItemBox
              6. at (48,34) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 4, rect: [48,34 41.5x18] baseline: 13.796875 "Four" - ListItemMarkerBox <(anonymous)> at (24,34.5) content-size 12x17 children: not-inline + ListItemMarkerBox <(anonymous)> at (24,35) content-size 12x16 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,52) content-size 744x0 children: inline TextNode <#text> @@ -30,14 +30,14 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline ListItemBox
              7. at (48,68) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [48,68 29.8125x18] baseline: 13.796875 "One" - ListItemMarkerBox <(anonymous)> at (40,68) content-size 4x9 children: not-inline + ListItemMarkerBox <(anonymous)> at (40,69) content-size 4x8 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,86) content-size 744x0 children: inline TextNode <#text> ListItemBox
              8. at (48,86) content-size 744x18 children: inline frag 0 from TextNode start: 0, length: 3, rect: [48,86 33.875x18] baseline: 13.796875 "Two" - ListItemMarkerBox <(anonymous)> at (40,86) content-size 4x9 children: not-inline + ListItemMarkerBox <(anonymous)> at (40,87) content-size 4x8 children: not-inline TextNode <#text> BlockContainer <(anonymous)> at (48,104) content-size 744x0 children: inline TextNode <#text> @@ -52,22 +52,22 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600] PaintableWithLines (BlockContainer
                  .A) [8,16 784x36] PaintableWithLines (BlockContainer(anonymous)) [48,16 744x0] PaintableWithLines (ListItemBox
                • ) [48,16 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [24,16.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [24,17 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,34 744x0] PaintableWithLines (ListItemBox
                • ) [48,34 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [24,34.5 12x17] + MarkerPaintable (ListItemMarkerBox(anonymous)) [24,35 12x16] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,52 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,68 784x0] PaintableWithLines (BlockContainer
                    .B) [8,68 784x36] PaintableWithLines (BlockContainer(anonymous)) [48,68 744x0] PaintableWithLines (ListItemBox
                  • ) [48,68 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [40,68 4x9] + MarkerPaintable (ListItemMarkerBox(anonymous)) [40,69 4x8] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,86 744x0] PaintableWithLines (ListItemBox
                  • ) [48,86 744x18] - MarkerPaintable (ListItemMarkerBox(anonymous)) [40,86 4x9] + MarkerPaintable (ListItemMarkerBox(anonymous)) [40,87 4x8] TextPaintable (TextNode<#text>) PaintableWithLines (BlockContainer(anonymous)) [48,104 744x0] PaintableWithLines (BlockContainer(anonymous)) [8,120 784x0] diff --git a/Tests/LibWeb/Ref/expected/ol-items-text-ref.html b/Tests/LibWeb/Ref/expected/ol-items-text-ref.html new file mode 100644 index 00000000000..c61d56ca7d6 --- /dev/null +++ b/Tests/LibWeb/Ref/expected/ol-items-text-ref.html @@ -0,0 +1,8 @@ + + +
                      +
                    1. Item lower-alpha
                      2. +
                    2. Item upper-alpha
                      3. +
                    3. Item lower-roman
                      4. +
                    4. Item upper-roman
                      5. +
                    diff --git a/Tests/LibWeb/Ref/input/ol-items-text.html b/Tests/LibWeb/Ref/input/ol-items-text.html new file mode 100644 index 00000000000..6396b80964b --- /dev/null +++ b/Tests/LibWeb/Ref/input/ol-items-text.html @@ -0,0 +1,8 @@ + + +
                      +
                    1. Item lower-alpha
                      2. +
                    2. Item upper-alpha
                      3. +
                    3. Item lower-roman
                      4. +
                    4. Item upper-roman
                      5. +
                    diff --git a/Tests/LibWeb/Screenshot/images/acid2.png b/Tests/LibWeb/Screenshot/images/acid2.png index 5d3867946e3..712629ada21 100644 Binary files a/Tests/LibWeb/Screenshot/images/acid2.png and b/Tests/LibWeb/Screenshot/images/acid2.png differ diff --git a/Tests/LibWeb/Screenshot/images/details-open-then-closed.png b/Tests/LibWeb/Screenshot/images/details-open-then-closed.png index 85f6ca5d11c..e09e94f424d 100644 Binary files a/Tests/LibWeb/Screenshot/images/details-open-then-closed.png and b/Tests/LibWeb/Screenshot/images/details-open-then-closed.png differ diff --git a/Tests/LibWeb/Screenshot/images/ol-render-node-append-group-reversed-ref.png b/Tests/LibWeb/Screenshot/images/ol-render-node-append-group-reversed-ref.png index 28e9de31c67..be4de40ca4d 100644 Binary files a/Tests/LibWeb/Screenshot/images/ol-render-node-append-group-reversed-ref.png and b/Tests/LibWeb/Screenshot/images/ol-render-node-append-group-reversed-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/ol-render-node-append-reversed-ref.png b/Tests/LibWeb/Screenshot/images/ol-render-node-append-reversed-ref.png index 7b819e7add2..08384ea9b29 100644 Binary files a/Tests/LibWeb/Screenshot/images/ol-render-node-append-reversed-ref.png and b/Tests/LibWeb/Screenshot/images/ol-render-node-append-reversed-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-group-reversed-ref.png b/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-group-reversed-ref.png index 28e9de31c67..be4de40ca4d 100644 Binary files a/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-group-reversed-ref.png and b/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-group-reversed-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-reversed-ref.png b/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-reversed-ref.png index 7b819e7add2..08384ea9b29 100644 Binary files a/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-reversed-ref.png and b/Tests/LibWeb/Screenshot/images/ol-render-node-insert-last-reversed-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/ordered-list-ref.png b/Tests/LibWeb/Screenshot/images/ordered-list-ref.png index 71edeaec484..401e2bdfe20 100644 Binary files a/Tests/LibWeb/Screenshot/images/ordered-list-ref.png and b/Tests/LibWeb/Screenshot/images/ordered-list-ref.png differ