From c01c4b41e2e61eaa04470b56c2ff3cc0e6ab1fb0 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Fri, 18 Aug 2023 15:52:40 +0200
Subject: [PATCH] LibWeb: Add ViewportPaintable to represent viewports in the
 paint tree

This patch just adds the new root paintable and updates the tests
expectations. The next patch will move painting logic from the layout
viewport to the paint viewport.
---
 .../abspos-box-with-replaced-element.txt      |  2 +-
 ...abspos-flex-container-with-auto-height.txt |  2 +-
 ...bspos-image-with-min-height-constraint.txt |  2 +-
 ...os-not-replaced-multiple-auto-variants.txt |  2 +-
 .../abspos-with-percentage-insets.txt         |  2 +-
 Tests/LibWeb/Layout/expected/acid1.txt        |  2 +-
 ...continue-to-inherit-style-after-change.txt |  2 +-
 .../expected/aspect-ratio-auto-and-ratio.txt  |  2 +-
 .../Layout/expected/aspect-ratio-auto.txt     |  2 +-
 .../Layout/expected/aspect-ratio-ratio.txt    |  2 +-
 ...ed-abspos-element-must-not-be-negative.txt |  2 +-
 ...ed-abspos-element-must-not-be-negative.txt |  2 +-
 Tests/LibWeb/Layout/expected/blank.txt        |  2 +-
 ...bspos-with-auto-margins-in-inline-axis.txt |  2 +-
 ...gainst-padding-box-of-containing-block.txt |  2 +-
 ...-inline-with-percentage-vertical-align.txt |  2 +-
 ...e-children-and-nonempty-floating-child.txt |  2 +-
 ...-consider-all-currently-stacked-floats.txt |  2 +-
 .../bfc-float-left-break-vertically-2.txt     |  2 +-
 .../bfc-float-left-break-vertically.txt       |  2 +-
 ...ock-with-fit-content-width-constraints.txt |  2 +-
 .../block-with-fit-content-width.txt          |  2 +-
 ...block-with-hidden-overflow-after-float.txt |  2 +-
 ...th-hidden-overflow-after-sibling-float.txt |  2 +-
 .../block-with-max-content-width.txt          |  2 +-
 .../block-with-min-content-width.txt          |  2 +-
 ...egative-margin-and-no-intruding-floats.txt |  2 +-
 .../box-with-clearance-and-margin-top.txt     |  2 +-
 ...should-have-vertically-aligned-content.txt |  2 +-
 ...on-with-multiple-words-text-node-label.txt |  2 +-
 ...ton-with-text-node-label-and-font-size.txt |  2 +-
 .../button-with-text-node-label.txt           |  2 +-
 ...ar-both-from-inline-formatting-context.txt |  2 +-
 ...ear-both-without-introducing-clearance.txt |  2 +-
 .../expected/block-and-inline/clearfix.txt    |  2 +-
 .../expected/block-and-inline/float-1.txt     |  2 +-
 .../expected/block-and-inline/float-2.txt     |  2 +-
 .../expected/block-and-inline/float-3.txt     |  2 +-
 .../expected/block-and-inline/float-4.txt     |  2 +-
 .../float-clear-by-line-break.txt             |  2 +-
 ...d-right-with-justified-text-in-between.txt |  2 +-
 ...at-left-and-right-with-text-in-between.txt |  2 +-
 ...-content-containing-block-flex-display.txt |  2 +-
 .../float-max-content-containing-block.txt    |  2 +-
 .../block-and-inline/float-stress-1.txt       |  2 +-
 .../block-and-inline/float-stress-2.txt       |  2 +-
 .../block-and-inline/float-stress-3.txt       |  2 +-
 .../floats-and-negative-margins.txt           |  2 +-
 ...loat-left-and-sibling-with-margin-left.txt |  2 +-
 .../inline-block-baseline-1.txt               |  2 +-
 .../inline-block-baseline-2.txt               |  2 +-
 .../inline-block-percentage-max-width.txt     |  2 +-
 ...nline-block-with-max-width-fit-content.txt |  2 +-
 ...ht-and-auto-height-of-containing-block.txt |  2 +-
 .../inline-box-positioned-with-top-left.txt   |  2 +-
 ...th-vertical-margins-vertical-align-top.txt |  2 +-
 .../inline-box-with-vertical-margins.txt      |  2 +-
 ...rinsic-sizing-with-min-width-specified.txt |  2 +-
 ...us-sibling-if-wrapped-in-anonymous-box.txt |  2 +-
 .../block-and-inline/margin-collapse-1.txt    |  2 +-
 .../block-and-inline/margin-collapse-2.txt    |  2 +-
 .../block-and-inline/margin-collapse-3.txt    |  2 +-
 .../block-and-inline/margin-collapse-4.txt    |  2 +-
 .../block-and-inline/margin-collapse-5.txt    |  2 +-
 .../block-and-inline/margin-collapse-6.txt    |  2 +-
 ...in-must-not-collapse-across-nested-bfc.txt |  2 +-
 .../margin-padding-block-inline-start.txt     |  2 +-
 .../margin-padding-block-inline.txt           |  2 +-
 ...max-width-for-box-with-inline-children.txt |  2 +-
 .../max-width-must-not-expand-element.txt     |  2 +-
 ...ontributes-to-intrinsic-size-of-parent.txt |  2 +-
 .../max-width-percentage-100-border-box.txt   |  2 +-
 .../max-width-percentage-100.txt              |  2 +-
 ...min-width-for-box-with-inline-children.txt |  2 +-
 ...bfc-width-to-avoid-overlap-with-floats.txt |  2 +-
 ...n-height-with-containing-block-padding.txt |  2 +-
 .../percentage-min-height.txt                 |  2 +-
 ...ith-max-content-containing-block-width.txt |  2 +-
 ...-with-indefinite-containing-block-size.txt |  2 +-
 .../block-and-inline/relpos-block.txt         |  2 +-
 .../block-and-inline/relpos-float.txt         |  2 +-
 .../relpos-inline-element-js-offsets.txt      |  2 +-
 .../relpos-inline-elements.txt                |  2 +-
 .../single-br-inline-layout.txt               |  2 +-
 ...ns-set-zero-if-containing-size-smaller.txt |  2 +-
 ...y-layout-internal-box-without-crashing.txt |  2 +-
 ...-box-for-definite-sizes-without-layout.txt |  2 +-
 .../Layout/expected/calc-negate-length.txt    |  2 +-
 .../LibWeb/Layout/expected/css-all-unset.txt  |  2 +-
 .../Layout/expected/css-calc-border-width.txt |  2 +-
 Tests/LibWeb/Layout/expected/css-ex-unit.txt  |  2 +-
 .../Layout/expected/css-font-size-calc.txt    |  2 +-
 .../css-host-selector-gets-parsed.txt         |  2 +-
 .../Layout/expected/css-import-rule.txt       |  2 +-
 .../css-imported-sheet-with-media-rule.txt    |  2 +-
 .../css-invalid-psuedo-compound-selector.txt  |  2 +-
 ...css-line-height-percentage-inheritance.txt |  2 +-
 .../expected/css-logical-inset-properties.txt |  2 +-
 .../expected/css-namespace-rule-matches.txt   |  2 +-
 .../expected/css-namespace-rule-no-match.txt  |  2 +-
 .../css-namespace-tag-name-selector.txt       |  2 +-
 .../css-namespace-universal-selector.txt      |  2 +-
 .../css-pseudo-element-blockification.txt     |  2 +-
 ...should-not-be-affected-by-inline-style.txt |  2 +-
 ...ot-be-affected-by-presentational-hints.txt |  2 +-
 Tests/LibWeb/Layout/expected/css-revert.txt   |  2 +-
 .../css-snap-a-length-as-a-border-width.txt   |  2 +-
 .../css-values/comparison-functions.txt       |  2 +-
 .../css-values/exponential-functions.txt      |  2 +-
 .../expected/css-values/numeric-constants.txt |  2 +-
 .../css-values/sign-related-functions.txt     |  2 +-
 .../css-values/stepped-value-functions.txt    |  2 +-
 .../css-values/trigonometric-functions.txt    |  2 +-
 .../Layout/expected/css-var-in-calc-block.txt |  2 +-
 .../display-table-inline-children.txt         |  2 +-
 Tests/LibWeb/Layout/expected/div_align.txt    |  2 +-
 .../Layout/expected/div_align_nested.txt      |  2 +-
 ...-abspos-item-with-preceding-whitespace.txt |  2 +-
 Tests/LibWeb/Layout/expected/flex-auto.txt    |  2 +-
 .../expected/flex-column-constained-wrap.txt  |  2 +-
 .../flex-column-constrained-nowrap.txt        |  2 +-
 ...n-height-constrained-width-constrained.txt |  2 +-
 .../flex-column-height-constrained.txt        |  2 +-
 .../flex-column-height-unconstrained.txt      |  2 +-
 ...mn-item-with-auto-height-and-max-width.txt |  2 +-
 ...g-auto-width-with-max-width-constraint.txt |  2 +-
 ...th-auto-height-depending-on-auto-width.txt |  2 +-
 .../flex-container-constrained-nowrap.txt     |  2 +-
 .../flex-container-constrained-wrap.txt       |  2 +-
 .../flex-container-width-constrained.txt      |  2 +-
 .../flex-frozen-items-should-be-respected.txt |  2 +-
 .../Layout/expected/flex-grow-0-column.txt    |  2 +-
 Tests/LibWeb/Layout/expected/flex-grow-1.txt  |  2 +-
 Tests/LibWeb/Layout/expected/flex-grow-2.txt  |  2 +-
 .../flex-item-auto-height-with-wrap.txt       |  2 +-
 ...tem-on-row-with-intrinsic-aspect-ratio.txt |  2 +-
 ...dding-relative-to-flex-container-width.txt |  2 +-
 ...lex-item-with-cyclic-percentage-height.txt |  2 +-
 .../flex-item-with-intrinsic-aspect-ratio.txt |  2 +-
 .../flex-margin-auto-justify-content.txt      |  2 +-
 Tests/LibWeb/Layout/expected/flex-row.txt     |  2 +-
 .../LibWeb/Layout/expected/flex-shrink-1.txt  |  2 +-
 .../LibWeb/Layout/expected/flex-shrink-2.txt  |  2 +-
 .../LibWeb/Layout/expected/flex-shrink-3.txt  |  2 +-
 ...child-static-position-with-align-items.txt |  2 +-
 ...d-static-position-with-justify-content.txt |  2 +-
 .../flex/align-keywords-start-and-end.txt     |  2 +-
 .../expected/flex/align-self-end-crash.txt    |  2 +-
 ...x-container-with-max-content-main-size.txt |  2 +-
 ...-baseline-with-inline-flex-empty-child.txt |  2 +-
 .../Layout/expected/flex/calc-flex-basis.txt  |  2 +-
 ...-sizing-border-box-and-nonzero-padding.txt |  2 +-
 ...n-container-with-max-width-max-content.txt |  2 +-
 ...-aspect-ratio-and-percentage-max-width.txt |  2 +-
 ...-aspect-ratio-and-automatic-cross-size.txt |  2 +-
 ...-column-item-with-percentage-max-width.txt |  2 +-
 ...-cross-size-with-max-content-main-size.txt |  2 +-
 ...width-and-negative-margin-in-same-axis.txt |  2 +-
 .../flex/flex-gap-between-items-and-lines.txt |  2 +-
 .../flex/flex-item-min-width-fit-content.txt  |  2 +-
 ...layout-dependent-containing-block-size.txt |  2 +-
 ...-intrinsic-aspect-ratio-and-max-height.txt |  2 +-
 ...flex-row-reverse-with-centered-content.txt |  2 +-
 ...flex-shorthand-flex-basis-zero-percent.txt |  2 +-
 .../inf-available-space-with-auto-margins.txt |  2 +-
 ...ith-main-axis-margin-on-flex-container.txt |  2 +-
 ...mn-items-with-different-kinds-of-width.txt |  2 +-
 ...tem-that-only-has-natural-aspect-ratio.txt |  2 +-
 .../expected/flex/justify-content-1.txt       |  2 +-
 ...tify-content-space-between-single-item.txt |  2 +-
 ...justify-content-with-margin-auto-child.txt |  2 +-
 .../flex/list-container-display-contents.txt  |  2 +-
 ...column-container-with-automatic-height.txt |  2 +-
 ...is-with-indefinite-flex-container-size.txt |  2 +-
 .../Layout/expected/flex/relpos-flex-item.txt |  2 +-
 ...ut-with-space-between-and-space-around.txt |  2 +-
 ...-suggestion-with-box-sizing-border-box.txt |  2 +-
 .../flex/stretch-alignment-with-cross-gap.txt |  2 +-
 ...ntage-padding-against-indefinite-width.txt |  2 +-
 ...ntage-padding-against-indefinite-width.txt |  2 +-
 .../expected/font-with-many-normal-values.txt |  2 +-
 ...etComputedStyle-on-unconnected-element.txt |  2 +-
 .../Layout/expected/grid/abspos-item.txt      |  2 +-
 .../Layout/expected/grid/align-items.txt      |  2 +-
 .../Layout/expected/grid/align-self.txt       |  2 +-
 .../expected/grid/all-implicit-rows.txt       |  2 +-
 .../expected/grid/anonymous-inline-child.txt  |  2 +-
 .../LibWeb/Layout/expected/grid/auto-fill.txt |  2 +-
 .../grid/auto-fit-collapse-empty-tracks.txt   |  2 +-
 .../LibWeb/Layout/expected/grid/auto-fit.txt  |  2 +-
 .../Layout/expected/grid/auto-track-sizes.txt |  2 +-
 Tests/LibWeb/Layout/expected/grid/basic-2.txt |  2 +-
 Tests/LibWeb/Layout/expected/grid/basic.txt   |  2 +-
 Tests/LibWeb/Layout/expected/grid/borders.txt |  2 +-
 .../Layout/expected/grid/calc-track-size.txt  |  2 +-
 .../Layout/expected/grid/column-1fr-1fr.txt   |  2 +-
 .../Layout/expected/grid/column-auto-auto.txt |  2 +-
 .../expected/grid/different-column-sizes.txt  |  2 +-
 ...bute-extra-space-across-spanned-tracks.txt |  2 +-
 .../grid/float-container-columns-1fr-1fr.txt  |  2 +-
 .../grid/floating-table-wrapper-width.txt     |  2 +-
 .../Layout/expected/grid/grid-gap-1.txt       |  2 +-
 .../Layout/expected/grid/grid-gap-2.txt       |  2 +-
 .../Layout/expected/grid/grid-gap-3.txt       |  2 +-
 .../grid/grid-item-fixed-paddings.txt         |  2 +-
 .../expected/grid/grid-item-fixed-size.txt    |  2 +-
 .../grid-item-horizontal-margins-auto.txt     |  2 +-
 .../expected/grid/grid-item-min-size.txt      |  2 +-
 .../grid/grid-item-percentage-margins.txt     |  2 +-
 .../grid/grid-item-percentage-width-2.txt     |  2 +-
 .../grid/grid-item-percentage-width.txt       |  2 +-
 .../grid/grid-item-with-fit-content-width.txt |  2 +-
 ...id-row-height-affected-by-item-margins.txt |  2 +-
 .../expected/grid/grid-shorthand-property.txt |  2 +-
 .../Layout/expected/grid/grid-span-4.txt      |  2 +-
 .../grid/grid-template-areas-basics.txt       |  2 +-
 ...template-columns-with-min-css-function.txt |  2 +-
 .../Layout/expected/grid/grid-template.txt    |  2 +-
 .../expected/grid/grow-beyond-limits.txt      |  2 +-
 .../Layout/expected/grid/image-in-grid.txt    |  2 +-
 .../expected/grid/inline-grid-simple.txt      |  2 +-
 .../expected/grid/intrinsic-sized-column.txt  |  2 +-
 .../expected/grid/intrinsic-sized-grid-2.txt  |  2 +-
 .../expected/grid/intrinsic-sized-grid.txt    |  2 +-
 .../expected/grid/item-column-span-2.txt      |  2 +-
 .../grid/item-min-max-percentage-width.txt    |  2 +-
 .../grid/item-span-exceeds-columns-size.txt   |  2 +-
 .../Layout/expected/grid/justify-items.txt    |  2 +-
 .../Layout/expected/grid/justify-self.txt     |  2 +-
 .../expected/grid/justify-start-min-width.txt |  2 +-
 .../Layout/expected/grid/min-max-content.txt  |  2 +-
 .../LibWeb/Layout/expected/grid/minmax-1.txt  |  2 +-
 .../LibWeb/Layout/expected/grid/minmax-2.txt  |  2 +-
 .../LibWeb/Layout/expected/grid/minmax-3.txt  |  2 +-
 .../grid/minmax-auto-track-definition.txt     |  2 +-
 .../Layout/expected/grid/minmax-invalid-1.txt |  2 +-
 .../grid/minmax-with-max-function-inside.txt  |  2 +-
 .../Layout/expected/grid/named-tracks.txt     |  2 +-
 .../grid/negative-grid-item-column-index.txt  |  2 +-
 Tests/LibWeb/Layout/expected/grid/order.txt   |  2 +-
 .../expected/grid/place-items-center.txt      |  2 +-
 .../Layout/expected/grid/place-self.txt       |  2 +-
 .../expected/grid/positions-and-spans.txt     |  2 +-
 .../Layout/expected/grid/relpos-grid-item.txt |  2 +-
 Tests/LibWeb/Layout/expected/grid/repeat.txt  |  2 +-
 Tests/LibWeb/Layout/expected/grid/row-1fr.txt |  2 +-
 .../Layout/expected/grid/row-height.txt       |  2 +-
 .../expected/grid/row-span-2-maxcontent.txt   |  2 +-
 .../expected/grid/row-span-2-mincontent.txt   |  2 +-
 .../expected/grid/row-span-2-with-gaps.txt    |  2 +-
 .../Layout/expected/grid/row-span-2.txt       |  2 +-
 .../Layout/expected/grid/rows-1fr-1fr.txt     |  2 +-
 ...nfinite-spinning-in-space-distribution.txt |  2 +-
 .../grid/template-lines-and-areas.txt         |  2 +-
 .../grid/track-size-calc-with-percentage.txt  |  2 +-
 .../grid/two-items-spanning-one-1fr-row.txt   |  2 +-
 .../grid/unresolvable-percentage-track.txt    |  2 +-
 .../expected/grid/valid-grid-areas-1.txt      |  2 +-
 .../expected/grid/vertical-margins-auto.txt   |  2 +-
 ...-of-absolute-position-box-with-padding.txt |  2 +-
 .../image-display-block-margin-auto.txt       |  2 +-
 ...ge-with-multiple-constraint-violations.txt |  2 +-
 ...with-box-sizing-border-box-and-padding.txt |  2 +-
 ...-and-indefinite-containing-block-width.txt |  2 +-
 ...and-min-content-containing-block-width.txt |  2 +-
 Tests/LibWeb/Layout/expected/inline-size.txt  |  2 +-
 .../input-element-with-display-inline.txt     |  2 +-
 ...text-node-invalidation-on-value-change.txt |  2 +-
 .../expected/inset-shorthand-property.txt     |  2 +-
 Tests/LibWeb/Layout/expected/lh-1.txt         |  2 +-
 Tests/LibWeb/Layout/expected/lh-2.txt         |  2 +-
 .../expected/line-height-calc-number.txt      |  2 +-
 Tests/LibWeb/Layout/expected/link-sheet.txt   |  2 +-
 ...late-block-components-whitespace-crash.txt |  2 +-
 .../misc/percentage-stroke-width-crash.txt    |  2 +-
 Tests/LibWeb/Layout/expected/misc/scroll.txt  |  2 +-
 .../Layout/expected/negative-max-size.txt     |  2 +-
 ...ntage-padding-against-indefinite-width.txt |  2 +-
 .../overflow-x-hidden-with-border-radius.txt  |  2 +-
 ...containing-block-has-indefinite-height.txt |  2 +-
 .../expected/picture-source-media-query.txt   |  2 +-
 .../place-content-shorthand-property.txt      |  2 +-
 .../expected/position-absolute-from-edges.txt |  2 +-
 ...g-of-position-relative-floating-parent.txt |  2 +-
 .../expected/position-absolute-top-left.txt   |  2 +-
 .../position-empty-pseudo-elements.txt        |  2 +-
 Tests/LibWeb/Layout/expected/pre.txt          |  2 +-
 ...seudo-element-with-custom-properties-2.txt |  2 +-
 .../pseudo-element-with-custom-properties.txt |  2 +-
 .../replaced-box-with-vertical-margins.txt    |  2 +-
 ...ero-when-available-size-is-min-content.txt |  2 +-
 .../resolve-height-of-containing-block.txt    |  2 +-
 .../expected/set-margin-of-floating-box.txt   |  2 +-
 .../expected/svg-preserve-aspect-ratio.txt    |  2 +-
 .../expected/svg-transforms-and-viewboxes.txt |  2 +-
 ...with-indefinite-containing-block-width.txt |  2 +-
 ...ement-should-not-participate-in-layout.txt |  2 +-
 .../svg/svg-as-image-implicit-viewbox.txt     |  2 +-
 .../expected/svg/svg-as-image-invalid.txt     |  2 +-
 .../Layout/expected/svg/svg-as-image.txt      |  2 +-
 .../svg/svg-different-types-of-opacity.txt    |  2 +-
 .../expected/svg/svg-fill-with-bogus-url.txt  |  2 +-
 .../expected/svg/svg-g-with-opacity.txt       |  2 +-
 .../Layout/expected/svg/svg-inside-svg.txt    |  2 +-
 .../svg-intrinsic-size-in-one-dimension.txt   |  2 +-
 .../svg-negative-elliptical-arg-number.txt    |  2 +-
 .../svg/svg-path-with-implicit-lineto.txt     |  2 +-
 .../expected/svg/svg-symbol-with-viewbox.txt  |  2 +-
 ...with-css-variable-in-presentation-hint.txt |  2 +-
 .../expected/svg/svg-with-display-block.txt   |  2 +-
 ...ith-zero-intrinsic-size-and-no-viewbox.txt |  2 +-
 .../Layout/expected/svg/text-fill-none.txt    |  2 +-
 .../expected/table/align-top-and-bottom.txt   |  2 +-
 .../Layout/expected/table/auto-height.txt     |  2 +-
 .../Layout/expected/table/auto-margins.txt    |  2 +-
 .../avoid-div-by-zero-in-table-measures.txt   |  2 +-
 Tests/LibWeb/Layout/expected/table/basic.txt  |  2 +-
 .../table/border-collapse-is-inherited.txt    |  2 +-
 .../border-conflict-resolution-with-cell.txt  |  2 +-
 .../border-conflict-resolution-with-col.txt   |  2 +-
 .../border-conflict-resolution-with-row.txt   |  2 +-
 ...rder-conflict-resolution-with-rowgroup.txt |  2 +-
 ...border-spacing-and-borders-table-width.txt |  2 +-
 .../expected/table/border-spacing-colspan.txt |  2 +-
 .../expected/table/border-spacing-rowspan.txt |  2 +-
 .../border-spacing-with-percentage-width.txt  |  2 +-
 .../Layout/expected/table/border-spacing.txt  |  2 +-
 .../LibWeb/Layout/expected/table/borders.txt  |  2 +-
 .../Layout/expected/table/bottom-caption.txt  |  2 +-
 ...-auto-max-width-table-percentage-width.txt |  2 +-
 .../Layout/expected/table/cell-px-height.txt  |  2 +-
 ...cell-relative-to-specified-table-width.txt |  2 +-
 .../table/clip-spans-to-table-end.txt         |  2 +-
 .../table/colspan-percentage-width.txt        |  2 +-
 .../colspan-weighted-width-distribution.txt   |  2 +-
 .../table/colspan-width-distribution.txt      |  2 +-
 .../table/columns-width-distribution-1.txt    |  2 +-
 ...ed-layout-percentage-width-all-columns.txt |  2 +-
 .../table/fixed-layout-percentage-width.txt   |  2 +-
 .../fixed-layout-pixel-width-all-columns.txt  |  2 +-
 .../table/fixed-layout-pixel-width.txt        |  2 +-
 .../Layout/expected/table/fixed-layout.txt    |  2 +-
 .../Layout/expected/table/fixed-margins.txt   |  2 +-
 .../table/in-auto-height-flex-item.txt        |  2 +-
 .../expected/table/infinite-padding.txt       |  2 +-
 .../expected/table/inline-table-width.txt     |  2 +-
 .../table/long-caption-increases-width.txt    |  2 +-
 .../Layout/expected/table/multi-line-cell.txt |  2 +-
 .../expected/table/nested-table-box-width.txt |  2 +-
 .../table/percentage-width-columns.txt        |  2 +-
 ...ge-width-for-nested-table-is-like-auto.txt |  2 +-
 .../percentage-width-max-width-columns.txt    |  2 +-
 .../propagate-style-update-to-wrapper.txt     |  2 +-
 .../row-outer-size-with-computed-size.txt     |  2 +-
 .../Layout/expected/table/row-px-height.txt   |  2 +-
 .../table/row-span-and-nested-tables.txt      |  2 +-
 .../table/rows-height-distribution-1.txt      |  2 +-
 .../table/rows-height-distribution-2.txt      |  2 +-
 .../table/rows-height-distribution-3.txt      |  2 +-
 .../table/rows-height-distribution-4.txt      |  2 +-
 .../LibWeb/Layout/expected/table/rowspan.txt  |  2 +-
 Tests/LibWeb/Layout/expected/table/size.txt   |  2 +-
 .../table/stretch-to-fixed-height.txt         |  2 +-
 ...percentage-column-widths-less-than-100.txt |  2 +-
 .../table/table-cell-not-paintable.txt        |  2 +-
 ...e-formation-with-rowspan-in-the-middle.txt |  2 +-
 .../table/table-header-and-footer-groups.txt  |  2 +-
 .../Layout/expected/table/table-width.txt     |  2 +-
 .../Layout/expected/table/td-valign.txt       |  2 +-
 .../table/top-caption-with-padding.txt        |  2 +-
 ...strained-columns-increased-size-on-col.txt |  2 +-
 ...on-and-constrained-columns-size-on-col.txt |  2 +-
 ...h-distribution-and-constrained-columns.txt |  2 +-
 ...th-distribution-of-max-width-increment.txt |  2 +-
 .../expected/table/zero-columns-gridmax.txt   |  2 +-
 .../text-align-justify-with-forced-break.txt  |  2 +-
 .../Layout/expected/text-align-overflow.txt   |  2 +-
 Tests/LibWeb/Layout/expected/text-indent.txt  |  2 +-
 .../tolerate-css-percentage-overshoot.txt     |  2 +-
 .../expected/transform-calc-length-values.txt |  2 +-
 .../vertical-padding-relative-to-cb-width.txt |  2 +-
 .../viewport-overflow-propagation-1.txt       |  2 +-
 .../viewport-overflow-propagation-2.txt       |  2 +-
 Userland/Libraries/LibWeb/CMakeLists.txt      |  1 +
 Userland/Libraries/LibWeb/Layout/Viewport.cpp |  6 +++++
 Userland/Libraries/LibWeb/Layout/Viewport.h   |  2 ++
 .../Libraries/LibWeb/Painting/PaintableBox.h  |  2 +-
 .../LibWeb/Painting/ViewportPaintable.cpp     | 24 +++++++++++++++++++
 .../LibWeb/Painting/ViewportPaintable.h       | 24 +++++++++++++++++++
 389 files changed, 441 insertions(+), 384 deletions(-)
 create mode 100644 Userland/Libraries/LibWeb/Painting/ViewportPaintable.cpp
 create mode 100644 Userland/Libraries/LibWeb/Painting/ViewportPaintable.h

diff --git a/Tests/LibWeb/Layout/expected/abspos-box-with-replaced-element.txt b/Tests/LibWeb/Layout/expected/abspos-box-with-replaced-element.txt
index a2c7bd3268..2d5f6823f7 100644
--- a/Tests/LibWeb/Layout/expected/abspos-box-with-replaced-element.txt
+++ b/Tests/LibWeb/Layout/expected/abspos-box-with-replaced-element.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           frag 0 from ImageBox start: 0, length: 0, rect: [262,12 248x26.46875]
         ImageBox <img> at (262,12) content-size 248x26.46875 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [9,9 502x102]
     PaintableWithLines (BlockContainer<BODY>) [9,9 502x102]
       PaintableWithLines (BlockContainer<DIV>.image-container) [260,10 250x30.46875] overflow: [261,11 249x28.46875]
diff --git a/Tests/LibWeb/Layout/expected/abspos-flex-container-with-auto-height.txt b/Tests/LibWeb/Layout/expected/abspos-flex-container-with-auto-height.txt
index c3a759ea2e..9cced02978 100644
--- a/Tests/LibWeb/Layout/expected/abspos-flex-container-with-auto-height.txt
+++ b/Tests/LibWeb/Layout/expected/abspos-flex-container-with-auto-height.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Diese Website nutzt Cookies und vergleichbare Funktionen zur"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [8,8 514.859375x21.46875]
     PaintableBox (Box<BODY>) [8,8 514.859375x21.46875]
       PaintableWithLines (BlockContainer<DIV>) [9,9 512.859375x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/abspos-image-with-min-height-constraint.txt b/Tests/LibWeb/Layout/expected/abspos-image-with-min-height-constraint.txt
index cd4f5d6c95..1e0e3d92c8 100644
--- a/Tests/LibWeb/Layout/expected/abspos-image-with-min-height-constraint.txt
+++ b/Tests/LibWeb/Layout/expected/abspos-image-with-min-height-constraint.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x0 children: not-inline
       ImageBox <img#zero-dimensions-but-min-percentages> at (8,8) content-size 800x600 positioned children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 808x608]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 808x608]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16] overflow: [0,0 808x608]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 800x600]
       ImagePaintable (ImageBox<IMG>#zero-dimensions-but-min-percentages) [8,8 800x600]
diff --git a/Tests/LibWeb/Layout/expected/abspos-not-replaced-multiple-auto-variants.txt b/Tests/LibWeb/Layout/expected/abspos-not-replaced-multiple-auto-variants.txt
index e164088059..b4e1dfd50e 100644
--- a/Tests/LibWeb/Layout/expected/abspos-not-replaced-multiple-auto-variants.txt
+++ b/Tests/LibWeb/Layout/expected/abspos-not-replaced-multiple-auto-variants.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.both> at (11,11) content-size 10x10 positioned [BFC] children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x2]
       PaintableWithLines (BlockContainer<DIV>.only-t-l) [5,5 12x12]
diff --git a/Tests/LibWeb/Layout/expected/abspos-with-percentage-insets.txt b/Tests/LibWeb/Layout/expected/abspos-with-percentage-insets.txt
index 95542ace12..d8f2c76386 100644
--- a/Tests/LibWeb/Layout/expected/abspos-with-percentage-insets.txt
+++ b/Tests/LibWeb/Layout/expected/abspos-with-percentage-insets.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [9,9 502x402]
     PaintableWithLines (BlockContainer<BODY>) [9,9 502x402]
       PaintableWithLines (BlockContainer<DIV>.one) [310,210 30.6875x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/acid1.txt b/Tests/LibWeb/Layout/expected/acid1.txt
index c5cceb8795..d76ed21f4a 100644
--- a/Tests/LibWeb/Layout/expected/acid1.txt
+++ b/Tests/LibWeb/Layout/expected/acid1.txt
@@ -134,7 +134,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (20,400) content-size 480x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x420]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [15,15 490x390]
diff --git a/Tests/LibWeb/Layout/expected/anonymous-wrappers-continue-to-inherit-style-after-change.txt b/Tests/LibWeb/Layout/expected/anonymous-wrappers-continue-to-inherit-style-after-change.txt
index 313f98bafe..5fd59e8a9f 100644
--- a/Tests/LibWeb/Layout/expected/anonymous-wrappers-continue-to-inherit-style-after-change.txt
+++ b/Tests/LibWeb/Layout/expected/anonymous-wrappers-continue-to-inherit-style-after-change.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "anonymously wrapped text"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x89.84375] overflow: [0,0 800x95.28125]
     PaintableWithLines (BlockContainer<BODY>) [8,21.4375 784x73.84375]
       PaintableWithLines (BlockContainer<H1>) [8,21.4375 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/aspect-ratio-auto-and-ratio.txt b/Tests/LibWeb/Layout/expected/aspect-ratio-auto-and-ratio.txt
index 68f2e0c0fd..d1c1f82863 100644
--- a/Tests/LibWeb/Layout/expected/aspect-ratio-auto-and-ratio.txt
+++ b/Tests/LibWeb/Layout/expected/aspect-ratio-auto-and-ratio.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         ImageBox <img> at (9,111) content-size 200x200 children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x320]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x304]
       PaintableWithLines (BlockContainer<DIV>) [8,8 202x102]
diff --git a/Tests/LibWeb/Layout/expected/aspect-ratio-auto.txt b/Tests/LibWeb/Layout/expected/aspect-ratio-auto.txt
index 3adbcc1b0c..e9ab58b41a 100644
--- a/Tests/LibWeb/Layout/expected/aspect-ratio-auto.txt
+++ b/Tests/LibWeb/Layout/expected/aspect-ratio-auto.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         ImageBox <img> at (9,11) content-size 200x200 children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x220]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x204]
       PaintableWithLines (BlockContainer<DIV>) [8,8 202x2]
diff --git a/Tests/LibWeb/Layout/expected/aspect-ratio-ratio.txt b/Tests/LibWeb/Layout/expected/aspect-ratio-ratio.txt
index 1c2d1fbeba..d8107c8e02 100644
--- a/Tests/LibWeb/Layout/expected/aspect-ratio-ratio.txt
+++ b/Tests/LibWeb/Layout/expected/aspect-ratio-ratio.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         ImageBox <img> at (9,111) content-size 200x100 children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x220]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x204]
       PaintableWithLines (BlockContainer<DIV>) [8,8 202x102]
diff --git a/Tests/LibWeb/Layout/expected/automatic-height-of-non-replaced-abspos-element-must-not-be-negative.txt b/Tests/LibWeb/Layout/expected/automatic-height-of-non-replaced-abspos-element-must-not-be-negative.txt
index 726b1c9152..167d21cfc9 100644
--- a/Tests/LibWeb/Layout/expected/automatic-height-of-non-replaced-abspos-element-must-not-be-negative.txt
+++ b/Tests/LibWeb/Layout/expected/automatic-height-of-non-replaced-abspos-element-must-not-be-negative.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.inner> at (9,9) content-size 0x0 positioned [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x0] overflow: [8,8 2x2]
     PaintableWithLines (BlockContainer<BODY>.outer) [8,8 0x0] overflow: [8,8 2x2]
       PaintableWithLines (BlockContainer<DIV>.inner) [8,8 2x2]
diff --git a/Tests/LibWeb/Layout/expected/automatic-width-of-non-replaced-abspos-element-must-not-be-negative.txt b/Tests/LibWeb/Layout/expected/automatic-width-of-non-replaced-abspos-element-must-not-be-negative.txt
index 0e104822b1..00b7734dec 100644
--- a/Tests/LibWeb/Layout/expected/automatic-width-of-non-replaced-abspos-element-must-not-be-negative.txt
+++ b/Tests/LibWeb/Layout/expected/automatic-width-of-non-replaced-abspos-element-must-not-be-negative.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body.outer> at (8,8) content-size 0x0 positioned [BFC] children: not-inline
       BlockContainer <div.inner> at (9,9) content-size 0x0 positioned [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x0] overflow: [8,8 2x2]
     PaintableWithLines (BlockContainer<BODY>.outer) [8,8 0x0] overflow: [8,8 2x2]
       PaintableWithLines (BlockContainer<DIV>.inner) [8,8 2x2]
diff --git a/Tests/LibWeb/Layout/expected/blank.txt b/Tests/LibWeb/Layout/expected/blank.txt
index b9fb27d151..e3bc5878a3 100644
--- a/Tests/LibWeb/Layout/expected/blank.txt
+++ b/Tests/LibWeb/Layout/expected/blank.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x0 children: inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-auto-margins-in-inline-axis.txt b/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-auto-margins-in-inline-axis.txt
index 4191b2d995..2e88d26a20 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-auto-margins-in-inline-axis.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-auto-margins-in-inline-axis.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div#bar> at (699,101) content-size 100x100 positioned [BFC] children: not-inline
       BlockContainer <div#baz> at (1,201) content-size 100x100 positioned [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x20] overflow: [0,0 800x302]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x2] overflow: [0,0 800x302]
       PaintableWithLines (BlockContainer<DIV>#foo) [349,0 102x102]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-percentage-height-resolved-against-padding-box-of-containing-block.txt b/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-percentage-height-resolved-against-padding-box-of-containing-block.txt
index 758d7e8153..2659c8440a 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-percentage-height-resolved-against-padding-box-of-containing-block.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/abspos-with-percentage-height-resolved-against-padding-box-of-containing-block.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,248) content-size 784x0 positioned children: not-inline
       BlockContainer <div.abspos> at (8,8) content-size 784x240 positioned [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x256]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x240]
       PaintableWithLines (BlockContainer<DIV>.abspos) [8,8 784x240]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/atomic-inline-with-percentage-vertical-align.txt b/Tests/LibWeb/Layout/expected/block-and-inline/atomic-inline-with-percentage-vertical-align.txt
index 5f78f71504..d7dff8d373 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/atomic-inline-with-percentage-vertical-align.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/atomic-inline-with-percentage-vertical-align.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BreakNode <br>
       BlockContainer <div.clump> at (3,35) content-size 30x30 inline-block [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x64.5] overflow: [1,1 798x64]
     PaintableWithLines (BlockContainer<BODY>) [1,1 798x62.5] overflow: [2,2 796x63]
       PaintableWithLines (BlockContainer<DIV>.clump) [3,2 32x32]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/automatic-size-of-block-container-with-inline-children-and-nonempty-floating-child.txt b/Tests/LibWeb/Layout/expected/block-and-inline/automatic-size-of-block-container-with-inline-children-and-nonempty-floating-child.txt
index d303b2cb6a..9db911b247 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/automatic-size-of-block-container-with-inline-children-and-nonempty-floating-child.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/automatic-size-of-block-container-with-inline-children-and-nonempty-floating-child.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.green> at (78,78) content-size 0x0 floating [BFC] children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x0] overflow: [8,8 140x100]
     PaintableWithLines (BlockContainer<BODY>) [8,8 140x100]
       PaintableWithLines (BlockContainer<DIV>.black) [8,8 140x100]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/bfc-consider-all-currently-stacked-floats.txt b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-consider-all-currently-stacked-floats.txt
index 27246ba4da..fdaa11b127 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/bfc-consider-all-currently-stacked-floats.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-consider-all-currently-stacked-floats.txt
@@ -29,7 +29,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,42.9375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x108]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically-2.txt
index c25d1efb3c..43b2f8d724 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically-2.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically-2.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (0,0) content-size 200x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x150]
     PaintableWithLines (BlockContainer<BODY>) [0,0 200x0] overflow: [0,0 200x150]
       PaintableWithLines (BlockContainer<UL>) [0,0 200x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically.txt b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically.txt
index b5ad17327e..6c3f7b1efd 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/bfc-float-left-break-vertically.txt
@@ -16,7 +16,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.green> at (3,56) content-size 100x50 floating [BFC] children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x108]
     PaintableWithLines (BlockContainer(anonymous)) [1,1 798x0]
     PaintableWithLines (BlockContainer<BODY>) [1,1 402x4]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width-constraints.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width-constraints.txt
index cceb3112a5..80c227e3ea 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width-constraints.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width-constraints.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,48.9375) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x58.9375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x40.9375]
       PaintableWithLines (BlockContainer<DIV>.box) [10,10 140.28125x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width.txt
index 75e02f0112..a80515740f 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-fit-content-width.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,29.46875) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x39.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x21.46875]
       PaintableWithLines (BlockContainer<DIV>.box) [10,10 140.28125x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-float.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-float.txt
index c02f5a71ca..ebb5313cc4 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-float.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-float.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,25.46875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-sibling-float.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-sibling-float.txt
index d5e6162b13..be7ace39c5 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-sibling-float.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-hidden-overflow-after-sibling-float.txt
@@ -46,7 +46,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> at (8,42.9375) content-size 784x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-max-content-width.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-max-content-width.txt
index 8b83f8ed5c..648423c0a9 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-max-content-width.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-max-content-width.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,68.40625) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x78.40625]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x60.40625]
       PaintableWithLines (BlockContainer<DIV>.foo) [10,10 152.21875x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt
index edc9f21a36..e8145108e5 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-min-content-width.txt
@@ -32,7 +32,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,122.21875) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x132.21875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x114.21875]
       PaintableWithLines (BlockContainer<DIV>.foo) [10,10 95.765625x37.40625]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-negative-margin-and-no-intruding-floats.txt b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-negative-margin-and-no-intruding-floats.txt
index b787acaf2b..52137702e3 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/block-with-negative-margin-and-no-intruding-floats.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/block-with-negative-margin-and-no-intruding-floats.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "intruding on this div"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x57.40625]
     PaintableWithLines (BlockContainer<BODY>) [109,9 302x39.40625] overflow: [60,10 350x37.40625]
       PaintableWithLines (BlockContainer<DIV>) [60,10 202x37.40625]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/box-with-clearance-and-margin-top.txt b/Tests/LibWeb/Layout/expected/block-and-inline/box-with-clearance-and-margin-top.txt
index c7c0a7db9a..8bffb30adc 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/box-with-clearance-and-margin-top.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/box-with-clearance-and-margin-top.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.clearfix> at (8,108) content-size 10x10 children: not-inline
         BlockContainer <div.square.black> at (8,218) content-size 49x49 floating [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x110] overflow: [8,8 784x259]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x110] overflow: [8,8 784x259]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-should-have-vertically-aligned-content.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-should-have-vertically-aligned-content.txt
index 9d6237d5ac..bf0c5c5a6e 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/button-should-have-vertically-aligned-content.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/button-should-have-vertically-aligned-content.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 BlockContainer <(anonymous)> at (22,186.734375) content-size 48.6875x0 children: inline
                   TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableWithLines (BlockContainer<BUTTON>.button.border-black) [8,8 76.6875x200]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-multiple-words-text-node-label.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-multiple-words-text-node-label.txt
index 5454f6f02e..c6a02a0924 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-multiple-words-text-node-label.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-multiple-words-text-node-label.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "A B C"
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
       PaintableWithLines (BlockContainer<BUTTON>) [8,8 59.921875x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label-and-font-size.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label-and-font-size.txt
index 618639063f..fdf3b22532 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label-and-font-size.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label-and-font-size.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "Test"
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x56.40625]
       PaintableWithLines (BlockContainer<BUTTON>) [8,8 121.65625x56.40625]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label.txt b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label.txt
index 7a2a8746be..06d13ab98a 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/button-with-text-node-label.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "Test"
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
       PaintableWithLines (BlockContainer<BUTTON>) [8,8 47.21875x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-from-inline-formatting-context.txt b/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-from-inline-formatting-context.txt
index 63a4ad5645..76d21be640 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-from-inline-formatting-context.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-from-inline-formatting-context.txt
@@ -22,7 +22,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           TextNode <#text>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-without-introducing-clearance.txt b/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-without-introducing-clearance.txt
index 47560fd355..75054a6502 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-without-introducing-clearance.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/clear-both-without-introducing-clearance.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "lower"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x125.9375]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x109.9375]
       PaintableWithLines (BlockContainer<DIV>.upper) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/clearfix.txt b/Tests/LibWeb/Layout/expected/block-and-inline/clearfix.txt
index 25cf094f60..2d008679ef 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/clearfix.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/clearfix.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,108) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x100]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-1.txt
index 1fe1ceec26..b42e88078c 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-1.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-1.txt
@@ -113,7 +113,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,340.34375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x332.34375]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-2.txt
index 6a3155aa69..f775d92c76 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-2.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-2.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,25.46875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x60]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-3.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-3.txt
index 0b7130dffe..b27a1d684c 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-3.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-3.txt
@@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,127.46875) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 780x119.46875]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 780x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-4.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-4.txt
index d43c87013e..b797fd3c19 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-4.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-4.txt
@@ -29,7 +29,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x60]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 780x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-clear-by-line-break.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-clear-by-line-break.txt
index a6db6a06ff..fd61548f3f 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-clear-by-line-break.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-clear-by-line-break.txt
@@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       InlineNode <span>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x35.40625]
       PaintableWithLines (BlockContainer<SPAN>.a) [8,8 100x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-justified-text-in-between.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-justified-text-in-between.txt
index d1aafa4602..84f3f1cfa1 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-justified-text-in-between.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-justified-text-in-between.txt
@@ -201,7 +201,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.right> at (489,213) content-size 300x200 floating [BFC] children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [251,9 540x401.53125] overflow: [252,10 538.34375x399.53125]
       PaintableWithLines (BlockContainer<DIV>.left) [252,10 302x202]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-text-in-between.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-text-in-between.txt
index c2996741ba..0816a39cd8 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-text-in-between.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-left-and-right-with-text-in-between.txt
@@ -61,7 +61,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.right> at (489,213) content-size 300x200 floating [BFC] children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [251,9 540x401.53125]
       PaintableWithLines (BlockContainer<DIV>.left) [252,10 302x202]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block-flex-display.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block-flex-display.txt
index d2f7a69467..667e46a534 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block-flex-display.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block-flex-display.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                   "B"
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 23.609375x17.46875]
       PaintableBox (Box<DIV>.display_flex) [8,8 23.609375x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block.txt
index f04fe95628..041bd1b8e8 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-max-content-containing-block.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "B"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 23.609375x17.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 23.609375x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt
index 5def947230..db0a4812fe 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-1.txt
@@ -76,7 +76,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.righty> at (278,190) content-size 30x30 floating [BFC] children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x268] overflow: [0,0 800x285]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252] overflow: [8,8 784x277]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-2.txt
index 5a1ae52f8e..0cb2b4457e 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-2.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-2.txt
@@ -17,7 +17,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (0,50) content-size 800x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>.js) [0,0 800x200]
     PaintableWithLines (BlockContainer<BODY>) [0,0 800x50] overflow: [0,0 800x200]
       PaintableWithLines (BlockContainer<DIV>#page) [0,0 800x50] overflow: [0,0 800x200]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-3.txt b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-3.txt
index f2d4dc94c4..c26bb7bf41 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-3.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/float-stress-3.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.two> at (108,78) content-size 200x50 floating [BFC] children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x268]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/floats-and-negative-margins.txt b/Tests/LibWeb/Layout/expected/block-and-inline/floats-and-negative-margins.txt
index dae3ecf591..bf16b29bbf 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/floats-and-negative-margins.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/floats-and-negative-margins.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           TextNode <#text>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [100,8 200x200] overflow: [50,8 250x200]
       PaintableWithLines (BlockContainer<DIV>.row) [50,8 250x200]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/ifc-float-left-and-sibling-with-margin-left.txt b/Tests/LibWeb/Layout/expected/block-and-inline/ifc-float-left-and-sibling-with-margin-left.txt
index d176e06f9d..739b215a5a 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/ifc-float-left-and-sibling-with-margin-left.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/ifc-float-left-and-sibling-with-margin-left.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Chrono Trigger"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x63]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x21.46875] overflow: [10,10 780x52]
       PaintableWithLines (BlockContainer<DIV>.thumbnail) [10,10 52x52]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-1.txt
index de18515277..ad8c691669 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-1.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-1.txt
@@ -21,7 +21,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> at (114,101.9375) content-size 202x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x94.9375]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-2.txt
index c5dadb4254..e8f0f40f6a 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-2.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-baseline-2.txt
@@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> at (114,49.9375) content-size 39.234375x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x62.40625]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-percentage-max-width.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-percentage-max-width.txt
index 72361aff8a..de7254bc63 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-percentage-max-width.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-percentage-max-width.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "New UI"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x113.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x97.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 134.109375x97.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-max-width-fit-content.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-max-width-fit-content.txt
index 253ca67456..e0680353fa 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-max-width-fit-content.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-max-width-fit-content.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hello friends"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x35.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x19.46875]
       PaintableWithLines (BlockContainer<SPAN>) [8,8 102.203125x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-percentage-height-and-auto-height-of-containing-block.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-percentage-height-and-auto-height-of-containing-block.txt
index d6db31b3cd..313f3cea2d 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-percentage-height-and-auto-height-of-containing-block.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-block-with-percentage-height-and-auto-height-of-containing-block.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "docs"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<DIV>.pure-menu-list) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-positioned-with-top-left.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-positioned-with-top-left.txt
index 94faf8fe64..631674a6d5 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-positioned-with-top-left.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-positioned-with-top-left.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x20]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.txt
index c18250379f..f8b6889fd9 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins-vertical-align-top.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div#inline-box> at (51,58) content-size 100x100 inline-block [BFC] children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x175]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins.txt b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins.txt
index 88ebe261d0..791a242afe 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/inline-box-with-vertical-margins.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div#inline-box> at (51,58) content-size 100x100 inline-block [BFC] children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x178.46875]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/intrinsic-sizing-with-min-width-specified.txt b/Tests/LibWeb/Layout/expected/block-and-inline/intrinsic-sizing-with-min-width-specified.txt
index 4e271d2e44..c48765bb12 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/intrinsic-sizing-with-min-width-specified.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/intrinsic-sizing-with-min-width-specified.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.outer> at (11,11) content-size 102x32 children: not-inline
         BlockContainer <div.inner> at (12,12) content-size 100x30 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x54]
     PaintableWithLines (BlockContainer<BODY>) [9,9 106x36]
       PaintableWithLines (BlockContainer<DIV>.outer) [10,10 104x34]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt b/Tests/LibWeb/Layout/expected/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt
index e99ea9c2b0..07af44855a 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/join-out-of-flow-box-with-previous-sibling-if-wrapped-in-anonymous-box.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.tab> at (8,38) content-size 200x30 inline-block [BFC] children: not-inline
         BlockContainer <div.timeline> at (592,38) content-size 200x30 floating [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x76]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x60]
       PaintableWithLines (BlockContainer<DIV>.banner) [8,8 200x30]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-1.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-1.txt
index 626e4c5563..1bf1dcc87e 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-1.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-1.txt
@@ -16,7 +16,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,279) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,25 784x229] overflow: [8,25 784x254]
       PaintableWithLines (BlockContainer<DIV>#foo) [33,25 102x102]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-2.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-2.txt
index 5b7d1ae1d6..9d40313d38 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-2.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-2.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,344) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x336]
       PaintableWithLines (BlockContainer<DIV>#foo) [8,8 102x102]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-3.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-3.txt
index 9cdac6c0dc..82f2a11057 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-3.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-3.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,358) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x350]
       PaintableWithLines (BlockContainer<DIV>#foo) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-4.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-4.txt
index 8db83a7083..b6b9c957ed 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-4.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-4.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,158) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x150]
       PaintableWithLines (BlockContainer<DIV>#foo) [8,8 100x50]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-5.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-5.txt
index ed5f4cc702..7195f06274 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-5.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-5.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (2,121.46875) content-size 168.96875x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x123.46875]
     PaintableWithLines (BlockContainer<BODY>) [1,1 170.96875x121.46875]
       PaintableWithLines (BlockContainer<DIV>.hmm) [2,2 168.96875x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-6.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-6.txt
index 3a0146e166..6212d6df5d 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-6.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-collapse-6.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.bfc> at (8,78) content-size 784x20 [BFC] children: not-inline
         BlockContainer <div.inner> at (8,78) content-size 20x20 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x106]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x90]
       PaintableWithLines (BlockContainer<DIV>.upper) [8,8 784x20]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-must-not-collapse-across-nested-bfc.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-must-not-collapse-across-nested-bfc.txt
index c867cece0e..5cc623b743 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-must-not-collapse-across-nested-bfc.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-must-not-collapse-across-nested-bfc.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.bfc> at (8,80) content-size 784x0 [BFC] children: not-inline
       BlockContainer <div.not-bfc> at (8,110) content-size 784x20 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116] overflow: [0,0 800x130]
     PaintableWithLines (BlockContainer<BODY>) [8,30 784x100]
       PaintableWithLines (BlockContainer<DIV>.not-bfc) [8,30 784x20]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline-start.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline-start.txt
index eb475af636..3a5f6a9526 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline-start.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline-start.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           InlineNode <span>
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x101.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 502x83.46875]
       PaintableWithLines (BlockContainer<DIV>.a) [10,10 500x81.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline.txt b/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline.txt
index a96dd94d49..124aa0fc51 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/margin-padding-block-inline.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           InlineNode <span>
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x121.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 502x103.46875]
       PaintableWithLines (BlockContainer<DIV>.a) [10,10 500x101.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-for-box-with-inline-children.txt b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-for-box-with-inline-children.txt
index aecaec5a19..fa301ae791 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-for-box-with-inline-children.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-for-box-with-inline-children.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "friends"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x187.96875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 206x169.96875]
       PaintableWithLines (BlockContainer<DIV>.outer) [10,10 204x167.96875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-must-not-expand-element.txt b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-must-not-expand-element.txt
index 7d4d0a0241..a1cc1926b1 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-must-not-expand-element.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-must-not-expand-element.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.outer> at (11,11) content-size 2x52 children: not-inline
         BlockContainer <div.inner> at (12,12) content-size 0x50 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [9,9 6x56]
     PaintableWithLines (BlockContainer<BODY>) [9,9 6x56]
       PaintableWithLines (BlockContainer<DIV>.outer) [10,10 4x54]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-on-child-block-with-width-auto-contributes-to-intrinsic-size-of-parent.txt b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-on-child-block-with-width-auto-contributes-to-intrinsic-size-of-parent.txt
index 1e490cc7f6..557e125b63 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-on-child-block-with-width-auto-contributes-to-intrinsic-size-of-parent.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-on-child-block-with-width-auto-contributes-to-intrinsic-size-of-parent.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "OPEN"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x41.46875]
     PaintableBox (Box<BODY>.outer) [9,9 782x23.46875]
       PaintableWithLines (BlockContainer<DIV>.middle) [10,10 204x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100-border-box.txt b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100-border-box.txt
index e7f0ef2326..4e11a9bb59 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100-border-box.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100-border-box.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "border box"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [9,9 95.59375x21.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 95.59375x21.46875]
       PaintableWithLines (BlockContainer<NAV>) [10,10 93.59375x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100.txt b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100.txt
index 3ef06f3a0d..affce82958 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/max-width-percentage-100.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "well hello friends"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [9,9 140.609375x21.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 140.609375x21.46875]
       PaintableWithLines (BlockContainer<DIV>) [10,10 138.609375x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/min-width-for-box-with-inline-children.txt b/Tests/LibWeb/Layout/expected/block-and-inline/min-width-for-box-with-inline-children.txt
index 2f3da95d4d..23533c2316 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/min-width-for-box-with-inline-children.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/min-width-for-box-with-inline-children.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "well hello friends"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x78.59375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 606x60.59375]
       PaintableWithLines (BlockContainer<DIV>.outer) [10,10 604x58.59375]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/narrow-bfc-width-to-avoid-overlap-with-floats.txt b/Tests/LibWeb/Layout/expected/block-and-inline/narrow-bfc-width-to-avoid-overlap-with-floats.txt
index 8acd372241..3fb92ac946 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/narrow-bfc-width-to-avoid-overlap-with-floats.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/narrow-bfc-width-to-avoid-overlap-with-floats.txt
@@ -21,7 +21,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "pulvinar ipsum eget nulla dapibus, ac varius mi eleifend."
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x1008]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x1008]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x1008]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x108.21875] overflow: [8,8 784x1000]
       PaintableWithLines (BlockContainer<DIV>.wrapper) [8,8 784x108.21875] overflow: [8,8 784x1000]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height-with-containing-block-padding.txt b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height-with-containing-block-padding.txt
index c9f826cc5e..17e8817b97 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height-with-containing-block-padding.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height-with-containing-block-padding.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "hello"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x616]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x600]
       PaintableWithLines (BlockContainer<DIV>.container) [8,8 784x600]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height.txt b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height.txt
index de78f2ccca..9c0745ebc1 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-height.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hello"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x53.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x37.46875]
       PaintableWithLines (BlockContainer<DIV>.hmm) [8,8 784x37.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-width-with-max-content-containing-block-width.txt b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-width-with-max-content-containing-block-width.txt
index 52e45fdec1..c3d4a3a04c 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-width-with-max-content-containing-block-width.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-min-width-with-max-content-containing-block-width.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hello"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 200x17.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 200x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-padding-on-inline-block-with-indefinite-containing-block-size.txt b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-padding-on-inline-block-with-indefinite-containing-block-size.txt
index a7653bcbe4..33d9c49a0d 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/percentage-padding-on-inline-block-with-indefinite-containing-block-size.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/percentage-padding-on-inline-block-with-indefinite-containing-block-size.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         frag 0 from BlockContainer start: 0, length: 0, rect: [8,21 0x0]
       BlockContainer <div> at (8,21) content-size 0x0 inline-block [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x17.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,21 0x0]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-block.txt b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-block.txt
index 3c2bda4223..869ad16bf0 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-block.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-block.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "athena"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x66.9375]
     PaintableWithLines (BlockContainer<BODY>) [10,10 604x46.9375]
       PaintableWithLines (BlockContainer<DIV>.exekiller) [12,12 204x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-float.txt b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-float.txt
index 55c0c1982a..ec81f8ec04 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-float.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-float.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "athena"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x35.46875] overflow: [2,2 796x35.46875]
     PaintableWithLines (BlockContainer<BODY>) [10,10 604x4] overflow: [12,12 208x25.46875]
       PaintableWithLines (BlockContainer<DIV>.exekiller) [12,12 204x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-element-js-offsets.txt b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-element-js-offsets.txt
index 28e97fb7aa..3427e716ab 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-element-js-offsets.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-element-js-offsets.txt
@@ -41,7 +41,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x156.6875] overflow: [8,8 784x172.6875]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x17.46875] overflow: [8,8 784x67.46875]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-elements.txt b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-elements.txt
index f775b22ad4..d6b0675e9b 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-elements.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/relpos-inline-elements.txt
@@ -19,7 +19,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875] overflow: [8,8 784x67.46875]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/single-br-inline-layout.txt b/Tests/LibWeb/Layout/expected/block-and-inline/single-br-inline-layout.txt
index 10cb5fe79f..b0294a1ecf 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/single-br-inline-layout.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/single-br-inline-layout.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BreakNode <br>
       BlockContainer <div#end> at (8,27.46875) content-size 784x2 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
       PaintableWithLines (BlockContainer<DIV>#begin) [8,8 784x2]
diff --git a/Tests/LibWeb/Layout/expected/block-and-inline/width-auto-margins-set-zero-if-containing-size-smaller.txt b/Tests/LibWeb/Layout/expected/block-and-inline/width-auto-margins-set-zero-if-containing-size-smaller.txt
index f36fe80a25..c13d740b02 100644
--- a/Tests/LibWeb/Layout/expected/block-and-inline/width-auto-margins-set-zero-if-containing-size-smaller.txt
+++ b/Tests/LibWeb/Layout/expected/block-and-inline/width-auto-margins-set-zero-if-containing-size-smaller.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "friends"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [9,9 174x59.34375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 104x59.34375] overflow: [10,10 173x57.34375]
       PaintableWithLines (BlockContainer<DIV>#container) [10,10 102x57.34375] overflow: [11,11 172x55.34375]
diff --git a/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt b/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt
index 4909aa348d..11ee51d696 100644
--- a/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt
+++ b/Tests/LibWeb/Layout/expected/blockify-layout-internal-box-without-crashing.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               BlockContainer <(anonymous)> at (10,10) content-size 0x0 table-cell [BFC] children: not-inline
                 BlockContainer <td> at (9,9) content-size 0x0 positioned [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x20]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x4]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 4x4]
diff --git a/Tests/LibWeb/Layout/expected/box-sizing-border-box-for-definite-sizes-without-layout.txt b/Tests/LibWeb/Layout/expected/box-sizing-border-box-for-definite-sizes-without-layout.txt
index 0846232580..6d23a7186a 100644
--- a/Tests/LibWeb/Layout/expected/box-sizing-border-box-for-definite-sizes-without-layout.txt
+++ b/Tests/LibWeb/Layout/expected/box-sizing-border-box-for-definite-sizes-without-layout.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Hello"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x66]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x50]
       PaintableBox (Box<DIV>.button) [8,18 89.71875x40]
diff --git a/Tests/LibWeb/Layout/expected/calc-negate-length.txt b/Tests/LibWeb/Layout/expected/calc-negate-length.txt
index e1d6405194..3ce8cccbfb 100644
--- a/Tests/LibWeb/Layout/expected/calc-negate-length.txt
+++ b/Tests/LibWeb/Layout/expected/calc-negate-length.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.container> at (8,8) content-size 100x50 children: not-inline
         BlockContainer <div.foo> at (8,8) content-size 99x50 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x66]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x50]
       PaintableWithLines (BlockContainer<DIV>.container) [8,8 100x50]
diff --git a/Tests/LibWeb/Layout/expected/css-all-unset.txt b/Tests/LibWeb/Layout/expected/css-all-unset.txt
index d7539599a6..d67478ec69 100644
--- a/Tests/LibWeb/Layout/expected/css-all-unset.txt
+++ b/Tests/LibWeb/Layout/expected/css-all-unset.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: inline
     InlineNode <body>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   InlinePaintable (InlineNode<HTML>)
     InlinePaintable (InlineNode<HEAD>)
       InlinePaintable (InlineNode<STYLE>)
diff --git a/Tests/LibWeb/Layout/expected/css-calc-border-width.txt b/Tests/LibWeb/Layout/expected/css-calc-border-width.txt
index 63778f0928..d45f1a9b95 100644
--- a/Tests/LibWeb/Layout/expected/css-calc-border-width.txt
+++ b/Tests/LibWeb/Layout/expected/css-calc-border-width.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x120 children: not-inline
       BlockContainer <div> at (18,18) content-size 100x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x120]
       PaintableWithLines (BlockContainer<DIV>) [8,8 120x120]
diff --git a/Tests/LibWeb/Layout/expected/css-ex-unit.txt b/Tests/LibWeb/Layout/expected/css-ex-unit.txt
index 286c01005e..8e61ddb875 100644
--- a/Tests/LibWeb/Layout/expected/css-ex-unit.txt
+++ b/Tests/LibWeb/Layout/expected/css-ex-unit.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x161.25 children: not-inline
       BlockContainer <div> at (8,8) content-size 107.5x161.25 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x177.25]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x161.25]
       PaintableWithLines (BlockContainer<DIV>) [8,8 107.5x161.25]
diff --git a/Tests/LibWeb/Layout/expected/css-font-size-calc.txt b/Tests/LibWeb/Layout/expected/css-font-size-calc.txt
index 49288733f4..8a9d8100d5 100644
--- a/Tests/LibWeb/Layout/expected/css-font-size-calc.txt
+++ b/Tests/LibWeb/Layout/expected/css-font-size-calc.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           "Hello friends"
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x125.1875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x109.1875]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/css-host-selector-gets-parsed.txt b/Tests/LibWeb/Layout/expected/css-host-selector-gets-parsed.txt
index 85b1e407ee..b406f091f1 100644
--- a/Tests/LibWeb/Layout/expected/css-host-selector-gets-parsed.txt
+++ b/Tests/LibWeb/Layout/expected/css-host-selector-gets-parsed.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "whf"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableWithLines (BlockContainer<DIV>) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/css-import-rule.txt b/Tests/LibWeb/Layout/expected/css-import-rule.txt
index 1dc45d503e..fd29e0225b 100644
--- a/Tests/LibWeb/Layout/expected/css-import-rule.txt
+++ b/Tests/LibWeb/Layout/expected/css-import-rule.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           "Crazy"
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x54.59375]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt b/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt
index 22b597670f..754b30213b 100644
--- a/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt
+++ b/Tests/LibWeb/Layout/expected/css-imported-sheet-with-media-rule.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           "Crazy"
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x109.1875]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/css-invalid-psuedo-compound-selector.txt b/Tests/LibWeb/Layout/expected/css-invalid-psuedo-compound-selector.txt
index f0e638a291..f88953f8e8 100644
--- a/Tests/LibWeb/Layout/expected/css-invalid-psuedo-compound-selector.txt
+++ b/Tests/LibWeb/Layout/expected/css-invalid-psuedo-compound-selector.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/css-line-height-percentage-inheritance.txt b/Tests/LibWeb/Layout/expected/css-line-height-percentage-inheritance.txt
index b196fab342..112c82dcd4 100644
--- a/Tests/LibWeb/Layout/expected/css-line-height-percentage-inheritance.txt
+++ b/Tests/LibWeb/Layout/expected/css-line-height-percentage-inheritance.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "The Linux Kernel Archives"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x54]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x36]
       PaintableWithLines (BlockContainer<DIV>) [10,10 780x34]
diff --git a/Tests/LibWeb/Layout/expected/css-logical-inset-properties.txt b/Tests/LibWeb/Layout/expected/css-logical-inset-properties.txt
index 9e6d057bed..e957be8bcc 100644
--- a/Tests/LibWeb/Layout/expected/css-logical-inset-properties.txt
+++ b/Tests/LibWeb/Layout/expected/css-logical-inset-properties.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.four-props> at (110,210) content-size 248x148 positioned [BFC] children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2] overflow: [8,8 502x402]
     PaintableWithLines (BlockContainer<BODY>) [8,8 502x402]
       PaintableWithLines (BlockContainer<DIV>.two-props) [59,109 400x200]
diff --git a/Tests/LibWeb/Layout/expected/css-namespace-rule-matches.txt b/Tests/LibWeb/Layout/expected/css-namespace-rule-matches.txt
index a101e10d3a..d6ca1d6663 100644
--- a/Tests/LibWeb/Layout/expected/css-namespace-rule-matches.txt
+++ b/Tests/LibWeb/Layout/expected/css-namespace-rule-matches.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,61.84375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,20 784x21.84375] overflow: [8,20 784x41.84375]
       PaintableWithLines (BlockContainer<P>) [8,20 784x21.84375]
diff --git a/Tests/LibWeb/Layout/expected/css-namespace-rule-no-match.txt b/Tests/LibWeb/Layout/expected/css-namespace-rule-no-match.txt
index 3869c804af..300edc444d 100644
--- a/Tests/LibWeb/Layout/expected/css-namespace-rule-no-match.txt
+++ b/Tests/LibWeb/Layout/expected/css-namespace-rule-no-match.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,61.84375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,20 784x21.84375] overflow: [8,20 784x41.84375]
       PaintableWithLines (BlockContainer<P>) [8,20 784x21.84375]
diff --git a/Tests/LibWeb/Layout/expected/css-namespace-tag-name-selector.txt b/Tests/LibWeb/Layout/expected/css-namespace-tag-name-selector.txt
index 59c954aa7a..de36aa39f6 100644
--- a/Tests/LibWeb/Layout/expected/css-namespace-tag-name-selector.txt
+++ b/Tests/LibWeb/Layout/expected/css-namespace-tag-name-selector.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,307.65625) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x299.65625]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x152]
diff --git a/Tests/LibWeb/Layout/expected/css-namespace-universal-selector.txt b/Tests/LibWeb/Layout/expected/css-namespace-universal-selector.txt
index f0f5922efb..4efbc2083f 100644
--- a/Tests/LibWeb/Layout/expected/css-namespace-universal-selector.txt
+++ b/Tests/LibWeb/Layout/expected/css-namespace-universal-selector.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,332) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x324]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 120x120]
diff --git a/Tests/LibWeb/Layout/expected/css-pseudo-element-blockification.txt b/Tests/LibWeb/Layout/expected/css-pseudo-element-blockification.txt
index dc11b6b563..9c644651ca 100644
--- a/Tests/LibWeb/Layout/expected/css-pseudo-element-blockification.txt
+++ b/Tests/LibWeb/Layout/expected/css-pseudo-element-blockification.txt
@@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "friends"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.foo) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-inline-style.txt b/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-inline-style.txt
index 3968cef847..69430a7133 100644
--- a/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-inline-style.txt
+++ b/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-inline-style.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.inner> at (12,64) content-size 98x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x122]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x104]
       PaintableWithLines (BlockContainer<DIV>.outer) [10,10 102x102]
diff --git a/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt b/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt
index dc3a6db127..8eee388733 100644
--- a/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt
+++ b/Tests/LibWeb/Layout/expected/css-pseudo-element-should-not-be-affected-by-presentational-hints.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 BlockContainer <(anonymous)> at (16,63) content-size 98x0 children: inline
                   TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x126]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x108]
       PaintableWithLines (TableWrapper(anonymous)) [10,10 110x106]
diff --git a/Tests/LibWeb/Layout/expected/css-revert.txt b/Tests/LibWeb/Layout/expected/css-revert.txt
index 91dfdb88db..81128822d8 100644
--- a/Tests/LibWeb/Layout/expected/css-revert.txt
+++ b/Tests/LibWeb/Layout/expected/css-revert.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           "Hello friends"
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x17.46875]
     PaintableWithLines (BlockContainer<BODY>) [0,0 800x17.46875]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/css-snap-a-length-as-a-border-width.txt b/Tests/LibWeb/Layout/expected/css-snap-a-length-as-a-border-width.txt
index fce2a4284b..c4f52694f1 100644
--- a/Tests/LibWeb/Layout/expected/css-snap-a-length-as-a-border-width.txt
+++ b/Tests/LibWeb/Layout/expected/css-snap-a-length-as-a-border-width.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.a> at (9,9) content-size 100x100 children: not-inline
       BlockContainer <div.b> at (9,111) content-size 100x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x204]
       PaintableWithLines (BlockContainer<DIV>.a) [8,8 102x102]
diff --git a/Tests/LibWeb/Layout/expected/css-values/comparison-functions.txt b/Tests/LibWeb/Layout/expected/css-values/comparison-functions.txt
index 654c2ce846..927a9c4fa7 100644
--- a/Tests/LibWeb/Layout/expected/css-values/comparison-functions.txt
+++ b/Tests/LibWeb/Layout/expected/css-values/comparison-functions.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <div.clamp> at (8,8) content-size 120x300 children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 0x0] overflow: [8,8 120x300]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x0] overflow: [8,8 120x300]
       PaintableWithLines (BlockContainer<DIV>.min) [8,8 80x0] overflow: [8,8 120x300]
diff --git a/Tests/LibWeb/Layout/expected/css-values/exponential-functions.txt b/Tests/LibWeb/Layout/expected/css-values/exponential-functions.txt
index 7b3187085f..bc5fa90bc0 100644
--- a/Tests/LibWeb/Layout/expected/css-values/exponential-functions.txt
+++ b/Tests/LibWeb/Layout/expected/css-values/exponential-functions.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               BlockContainer <div.exp> at (8,8) content-size 160x0 children: inline
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 0x0] overflow: [8,8 160x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x0] overflow: [8,8 160x0]
       PaintableWithLines (BlockContainer<DIV>.pow) [8,8 80x0] overflow: [8,8 160x0]
diff --git a/Tests/LibWeb/Layout/expected/css-values/numeric-constants.txt b/Tests/LibWeb/Layout/expected/css-values/numeric-constants.txt
index b9b489fb0e..1debd24dbc 100644
--- a/Tests/LibWeb/Layout/expected/css-values/numeric-constants.txt
+++ b/Tests/LibWeb/Layout/expected/css-values/numeric-constants.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.e> at (8,8) content-size 100x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 0x0] overflow: [8,8 100x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x0] overflow: [8,8 100x0]
       PaintableWithLines (BlockContainer<DIV>.pi) [8,8 80x0] overflow: [8,8 100x0]
diff --git a/Tests/LibWeb/Layout/expected/css-values/sign-related-functions.txt b/Tests/LibWeb/Layout/expected/css-values/sign-related-functions.txt
index 210cfb4ba5..3d76bb09fa 100644
--- a/Tests/LibWeb/Layout/expected/css-values/sign-related-functions.txt
+++ b/Tests/LibWeb/Layout/expected/css-values/sign-related-functions.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.sign> at (8,8) content-size 100x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 0x0] overflow: [8,8 100x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x0] overflow: [8,8 100x0]
       PaintableWithLines (BlockContainer<DIV>.abs) [8,8 80x0] overflow: [8,8 100x0]
diff --git a/Tests/LibWeb/Layout/expected/css-values/stepped-value-functions.txt b/Tests/LibWeb/Layout/expected/css-values/stepped-value-functions.txt
index e926ea01a8..87963dd9d5 100644
--- a/Tests/LibWeb/Layout/expected/css-values/stepped-value-functions.txt
+++ b/Tests/LibWeb/Layout/expected/css-values/stepped-value-functions.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <div.rem> at (8,8) content-size 120x0 children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 0x0] overflow: [8,8 120x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x0] overflow: [8,8 120x0]
       PaintableWithLines (BlockContainer<DIV>.round) [8,8 80x0] overflow: [8,8 120x0]
diff --git a/Tests/LibWeb/Layout/expected/css-values/trigonometric-functions.txt b/Tests/LibWeb/Layout/expected/css-values/trigonometric-functions.txt
index 1389d2faed..ee80b36c64 100644
--- a/Tests/LibWeb/Layout/expected/css-values/trigonometric-functions.txt
+++ b/Tests/LibWeb/Layout/expected/css-values/trigonometric-functions.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,988) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x996]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x996]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x996]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x980]
       PaintableWithLines (BlockContainer<DIV>.sin) [8,8 80x100]
diff --git a/Tests/LibWeb/Layout/expected/css-var-in-calc-block.txt b/Tests/LibWeb/Layout/expected/css-var-in-calc-block.txt
index 3b73ea93d8..f37c32c3ef 100644
--- a/Tests/LibWeb/Layout/expected/css-var-in-calc-block.txt
+++ b/Tests/LibWeb/Layout/expected/css-var-in-calc-block.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (10,10) content-size 780x252 children: not-inline
       BlockContainer <div> at (11,11) content-size 250x250 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x272]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x254]
       PaintableWithLines (BlockContainer<DIV>) [10,10 252x252]
diff --git a/Tests/LibWeb/Layout/expected/display-table-inline-children.txt b/Tests/LibWeb/Layout/expected/display-table-inline-children.txt
index 586b0a1060..578ea1824f 100644
--- a/Tests/LibWeb/Layout/expected/display-table-inline-children.txt
+++ b/Tests/LibWeb/Layout/expected/display-table-inline-children.txt
@@ -20,7 +20,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,608) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 1208x616]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 1208x616]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x616] overflow: [0,0 1208x616]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x600] overflow: [8,8 1200x600]
diff --git a/Tests/LibWeb/Layout/expected/div_align.txt b/Tests/LibWeb/Layout/expected/div_align.txt
index 8fdebb2537..3de95beb61 100644
--- a/Tests/LibWeb/Layout/expected/div_align.txt
+++ b/Tests/LibWeb/Layout/expected/div_align.txt
@@ -78,7 +78,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,637.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x637.875]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x637.875]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x637.875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x609.875] overflow: [8,8 784.484375x629.875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x137.46875]
diff --git a/Tests/LibWeb/Layout/expected/div_align_nested.txt b/Tests/LibWeb/Layout/expected/div_align_nested.txt
index b988f9fc24..1f3fcf03ae 100644
--- a/Tests/LibWeb/Layout/expected/div_align_nested.txt
+++ b/Tests/LibWeb/Layout/expected/div_align_nested.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> at (8,260.875) content-size 784x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252.875] overflow: [8,8 784.484375x252.875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x252.875] overflow: [8,8 784.484375x252.875]
diff --git a/Tests/LibWeb/Layout/expected/flex-abspos-item-with-preceding-whitespace.txt b/Tests/LibWeb/Layout/expected/flex-abspos-item-with-preceding-whitespace.txt
index 5efd0d4596..cd0d36205f 100644
--- a/Tests/LibWeb/Layout/expected/flex-abspos-item-with-preceding-whitespace.txt
+++ b/Tests/LibWeb/Layout/expected/flex-abspos-item-with-preceding-whitespace.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.orange> at (48,-12) content-size 100x100 positioned [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,-22 800x622]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,-22 800x622]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x76] overflow: [10,-22 780x120]
     PaintableWithLines (BlockContainer<BODY>) [18,18 764x40] overflow: [28,-22 744x120]
       PaintableBox (Box<DIV>.pink) [28,28 744x20] overflow: [38,-22 120x120]
diff --git a/Tests/LibWeb/Layout/expected/flex-auto.txt b/Tests/LibWeb/Layout/expected/flex-auto.txt
index bf8bb0ea1c..06ed644e28 100644
--- a/Tests/LibWeb/Layout/expected/flex-auto.txt
+++ b/Tests/LibWeb/Layout/expected/flex-auto.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 502x104] overflow: [9,9 500.015625x102]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-constained-wrap.txt b/Tests/LibWeb/Layout/expected/flex-column-constained-wrap.txt
index bd858d9710..e136efefca 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-constained-wrap.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-constained-wrap.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,260) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252]
       PaintableBox (Box<DIV>.container.column) [8,8 252x252]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-constrained-nowrap.txt b/Tests/LibWeb/Layout/expected/flex-column-constrained-nowrap.txt
index a0d510880e..af4520d8e5 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-constrained-nowrap.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-constrained-nowrap.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,260) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252]
       PaintableBox (Box<DIV>.container.column) [8,8 784x252]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-height-constrained-width-constrained.txt b/Tests/LibWeb/Layout/expected/flex-column-height-constrained-width-constrained.txt
index 9c5f0d7cfd..2759aa2e6a 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-height-constrained-width-constrained.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-height-constrained-width-constrained.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,260) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252]
       PaintableBox (Box<DIV>.container.column) [8,8 252x252]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-height-constrained.txt b/Tests/LibWeb/Layout/expected/flex-column-height-constrained.txt
index 766967bee7..8b1cdc9d57 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-height-constrained.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-height-constrained.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,260) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x252]
       PaintableBox (Box<DIV>.container) [8,8 784x252]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-height-unconstrained.txt b/Tests/LibWeb/Layout/expected/flex-column-height-unconstrained.txt
index 8e30595141..f2705a95ee 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-height-unconstrained.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-height-unconstrained.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,316) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x308]
       PaintableBox (Box<DIV>.my-container.column) [8,8 784x308]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-and-max-width.txt b/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-and-max-width.txt
index 1bd0fe174a..16899d01c5 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-and-max-width.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-and-max-width.txt
@@ -19,7 +19,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Software Engineer at"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x94.21875]
     PaintableBox (Box<BODY>) [1,1 798x92.21875]
       PaintableWithLines (BlockContainer<MAIN>) [2,2 402x90.21875]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-auto-width-with-max-width-constraint.txt b/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-auto-width-with-max-width-constraint.txt
index 53e18180f5..6e647382fe 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-auto-width-with-max-width-constraint.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-auto-width-with-max-width-constraint.txt
@@ -19,7 +19,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "background."
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x333.5]
     PaintableBox (Box<BODY>.hero) [1,1 602x331.5]
       PaintableWithLines (BlockContainer<DIV>.header) [101,2 402x329.5]
diff --git a/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-on-auto-width.txt b/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-on-auto-width.txt
index 4bd6c8734f..c1c85cd26a 100644
--- a/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-on-auto-width.txt
+++ b/Tests/LibWeb/Layout/expected/flex-column-item-with-auto-height-depending-on-auto-width.txt
@@ -21,7 +21,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> (not painted) [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x459.09375]
     PaintableBox (Box<BODY>.hero) [9,9 502x441.09375] overflow: [9,10 502x439.09375]
       PaintableWithLines (BlockContainer<DIV>.upper) [9,10 502x439.09375]
diff --git a/Tests/LibWeb/Layout/expected/flex-container-constrained-nowrap.txt b/Tests/LibWeb/Layout/expected/flex-container-constrained-nowrap.txt
index 8b50f46a35..44c73189b6 100644
--- a/Tests/LibWeb/Layout/expected/flex-container-constrained-nowrap.txt
+++ b/Tests/LibWeb/Layout/expected/flex-container-constrained-nowrap.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 252x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-container-constrained-wrap.txt b/Tests/LibWeb/Layout/expected/flex-container-constrained-wrap.txt
index 3aef80ac61..4c78e7d1cc 100644
--- a/Tests/LibWeb/Layout/expected/flex-container-constrained-wrap.txt
+++ b/Tests/LibWeb/Layout/expected/flex-container-constrained-wrap.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,214) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x206]
       PaintableBox (Box<DIV>.container) [8,8 252x206]
diff --git a/Tests/LibWeb/Layout/expected/flex-container-width-constrained.txt b/Tests/LibWeb/Layout/expected/flex-container-width-constrained.txt
index cabbb47b43..d793c594f6 100644
--- a/Tests/LibWeb/Layout/expected/flex-container-width-constrained.txt
+++ b/Tests/LibWeb/Layout/expected/flex-container-width-constrained.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container.width-constrained) [8,8 252x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-frozen-items-should-be-respected.txt b/Tests/LibWeb/Layout/expected/flex-frozen-items-should-be-respected.txt
index a454776774..700f57d6a2 100644
--- a/Tests/LibWeb/Layout/expected/flex-frozen-items-should-be-respected.txt
+++ b/Tests/LibWeb/Layout/expected/flex-frozen-items-should-be-respected.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "LongPieceOfText"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x72]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x54]
       PaintableBox (Box<DIV>.flexbox) [10,10 780x52]
diff --git a/Tests/LibWeb/Layout/expected/flex-grow-0-column.txt b/Tests/LibWeb/Layout/expected/flex-grow-0-column.txt
index e717defb31..0ebc785e0d 100644
--- a/Tests/LibWeb/Layout/expected/flex-grow-0-column.txt
+++ b/Tests/LibWeb/Layout/expected/flex-grow-0-column.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,68.40625) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x60.40625]
       PaintableBox (Box<DIV>.container) [8,8 502x60.40625]
diff --git a/Tests/LibWeb/Layout/expected/flex-grow-1.txt b/Tests/LibWeb/Layout/expected/flex-grow-1.txt
index da198c79ff..2034498c5f 100644
--- a/Tests/LibWeb/Layout/expected/flex-grow-1.txt
+++ b/Tests/LibWeb/Layout/expected/flex-grow-1.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 502x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-grow-2.txt b/Tests/LibWeb/Layout/expected/flex-grow-2.txt
index 496ce0ecfe..879037a9a6 100644
--- a/Tests/LibWeb/Layout/expected/flex-grow-2.txt
+++ b/Tests/LibWeb/Layout/expected/flex-grow-2.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 502x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-item-auto-height-with-wrap.txt b/Tests/LibWeb/Layout/expected/flex-item-auto-height-with-wrap.txt
index 1b56ea0f39..c733eab0ee 100644
--- a/Tests/LibWeb/Layout/expected/flex-item-auto-height-with-wrap.txt
+++ b/Tests/LibWeb/Layout/expected/flex-item-auto-height-with-wrap.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> (not painted) [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableBox (Box<BODY>.outer) [8,8 400x100]
       PaintableBox (Box<DIV>.inner) [8,8 400x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex-item-on-row-with-intrinsic-aspect-ratio.txt b/Tests/LibWeb/Layout/expected/flex-item-on-row-with-intrinsic-aspect-ratio.txt
index 66f97e7559..c2263c6434 100644
--- a/Tests/LibWeb/Layout/expected/flex-item-on-row-with-intrinsic-aspect-ratio.txt
+++ b/Tests/LibWeb/Layout/expected/flex-item-on-row-with-intrinsic-aspect-ratio.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     Box <body> at (0,0) content-size 800x200 flex-container(row) [FFC] children: not-inline
       ImageBox <img> at (0,0) content-size 400x200 flex-item children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x200]
     PaintableBox (Box<BODY>) [0,0 800x200]
       ImagePaintable (ImageBox<IMG>) [0,0 400x200]
diff --git a/Tests/LibWeb/Layout/expected/flex-item-vertical-padding-relative-to-flex-container-width.txt b/Tests/LibWeb/Layout/expected/flex-item-vertical-padding-relative-to-flex-container-width.txt
index fd0bc141cf..cd79bab7f5 100644
--- a/Tests/LibWeb/Layout/expected/flex-item-vertical-padding-relative-to-flex-container-width.txt
+++ b/Tests/LibWeb/Layout/expected/flex-item-vertical-padding-relative-to-flex-container-width.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x14] overflow: [10,10 780x201]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/flex-item-with-cyclic-percentage-height.txt b/Tests/LibWeb/Layout/expected/flex-item-with-cyclic-percentage-height.txt
index bc23acc216..99f3fbea1a 100644
--- a/Tests/LibWeb/Layout/expected/flex-item-with-cyclic-percentage-height.txt
+++ b/Tests/LibWeb/Layout/expected/flex-item-with-cyclic-percentage-height.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 "pillow"
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x41.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x23.46875]
       PaintableBox (Box<DIV>.flexrow) [10,10 780x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex-item-with-intrinsic-aspect-ratio.txt b/Tests/LibWeb/Layout/expected/flex-item-with-intrinsic-aspect-ratio.txt
index a8b37925b3..bf42f01660 100644
--- a/Tests/LibWeb/Layout/expected/flex-item-with-intrinsic-aspect-ratio.txt
+++ b/Tests/LibWeb/Layout/expected/flex-item-with-intrinsic-aspect-ratio.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     Box <body> at (0,0) content-size 400x200 flex-container(column) [FFC] children: not-inline
       ImageBox <img> at (0,0) content-size 400x200 flex-item children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x200]
     PaintableBox (Box<BODY>) [0,0 400x200]
       ImagePaintable (ImageBox<IMG>) [0,0 400x200]
diff --git a/Tests/LibWeb/Layout/expected/flex-margin-auto-justify-content.txt b/Tests/LibWeb/Layout/expected/flex-margin-auto-justify-content.txt
index 0a6602530c..a3ed6ea010 100644
--- a/Tests/LibWeb/Layout/expected/flex-margin-auto-justify-content.txt
+++ b/Tests/LibWeb/Layout/expected/flex-margin-auto-justify-content.txt
@@ -20,7 +20,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,62) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x54]
       PaintableBox (Box<DIV>.container) [8,8 602x54]
diff --git a/Tests/LibWeb/Layout/expected/flex-row.txt b/Tests/LibWeb/Layout/expected/flex-row.txt
index fade8f9742..f9083bfc9c 100644
--- a/Tests/LibWeb/Layout/expected/flex-row.txt
+++ b/Tests/LibWeb/Layout/expected/flex-row.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 784x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-shrink-1.txt b/Tests/LibWeb/Layout/expected/flex-shrink-1.txt
index c818bdb16a..7ce1417036 100644
--- a/Tests/LibWeb/Layout/expected/flex-shrink-1.txt
+++ b/Tests/LibWeb/Layout/expected/flex-shrink-1.txt
@@ -37,7 +37,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 252x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-shrink-2.txt b/Tests/LibWeb/Layout/expected/flex-shrink-2.txt
index 05da40dad9..85a5e63785 100644
--- a/Tests/LibWeb/Layout/expected/flex-shrink-2.txt
+++ b/Tests/LibWeb/Layout/expected/flex-shrink-2.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 502x104]
diff --git a/Tests/LibWeb/Layout/expected/flex-shrink-3.txt b/Tests/LibWeb/Layout/expected/flex-shrink-3.txt
index 291719a78f..003808f273 100644
--- a/Tests/LibWeb/Layout/expected/flex-shrink-3.txt
+++ b/Tests/LibWeb/Layout/expected/flex-shrink-3.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,112) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x104]
       PaintableBox (Box<DIV>.container) [8,8 502x104]
diff --git a/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-align-items.txt b/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-align-items.txt
index 34d4b213c2..5c0438a43c 100644
--- a/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-align-items.txt
+++ b/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-align-items.txt
@@ -76,7 +76,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> (not painted) [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x566]
     PaintableBox (Box<BODY>) [18,18 764x530]
       PaintableBox (Box<DIV>.outer.normal) [28,28 170x170] overflow: [38,38 170x150]
diff --git a/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-justify-content.txt b/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-justify-content.txt
index 19d348af30..20397631ce 100644
--- a/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-justify-content.txt
+++ b/Tests/LibWeb/Layout/expected/flex/abspos-flex-child-static-position-with-justify-content.txt
@@ -260,7 +260,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (38,2918) content-size 724x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2956]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2956]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2956]
     PaintableWithLines (BlockContainer<BODY>) [23,23 754x2910]
       PaintableWithLines (BlockContainer(anonymous)) [38,38 724x0]
diff --git a/Tests/LibWeb/Layout/expected/flex/align-keywords-start-and-end.txt b/Tests/LibWeb/Layout/expected/flex/align-keywords-start-and-end.txt
index 39aff298d8..293ad91a35 100644
--- a/Tests/LibWeb/Layout/expected/flex/align-keywords-start-and-end.txt
+++ b/Tests/LibWeb/Layout/expected/flex/align-keywords-start-and-end.txt
@@ -30,7 +30,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,276.40625) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x286.40625]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x268.40625]
       PaintableBox (Box<DIV>.flex.row.align-start) [10,10 502x202]
diff --git a/Tests/LibWeb/Layout/expected/flex/align-self-end-crash.txt b/Tests/LibWeb/Layout/expected/flex/align-self-end-crash.txt
index 7352955e69..783f61a944 100644
--- a/Tests/LibWeb/Layout/expected/flex/align-self-end-crash.txt
+++ b/Tests/LibWeb/Layout/expected/flex/align-self-end-crash.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     Box <body> at (8,8) content-size 784x0 flex-container(row) [FFC] children: not-inline
       BlockContainer <div> at (8,8) content-size 0x0 flex-item [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableBox (Box<BODY>) [8,8 784x0]
       PaintableWithLines (BlockContainer<DIV>) [8,8 0x0]
diff --git a/Tests/LibWeb/Layout/expected/flex/automatic-minimum-size-with-explicit-flex-basis-and-flex-container-with-max-content-main-size.txt b/Tests/LibWeb/Layout/expected/flex/automatic-minimum-size-with-explicit-flex-basis-and-flex-container-with-max-content-main-size.txt
index c023cb8097..ad1cf50c34 100644
--- a/Tests/LibWeb/Layout/expected/flex/automatic-minimum-size-with-explicit-flex-basis-and-flex-container-with-max-content-main-size.txt
+++ b/Tests/LibWeb/Layout/expected/flex/automatic-minimum-size-with-explicit-flex-basis-and-flex-container-with-max-content-main-size.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hello"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x70]
     PaintableBox (Box<BODY>.flex) [9,9 40.84375x52]
       PaintableWithLines (BlockContainer<DIV>.item) [10,10 38.84375x50]
diff --git a/Tests/LibWeb/Layout/expected/flex/box-baseline-with-inline-flex-empty-child.txt b/Tests/LibWeb/Layout/expected/flex/box-baseline-with-inline-flex-empty-child.txt
index 1b95074f4b..60c9296d99 100644
--- a/Tests/LibWeb/Layout/expected/flex/box-baseline-with-inline-flex-empty-child.txt
+++ b/Tests/LibWeb/Layout/expected/flex/box-baseline-with-inline-flex-empty-child.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> at (22,22) content-size 0x0 [BFC] children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x44]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x26]
       PaintableWithLines (BlockContainer<DIV>.first) [10,10 780x24]
diff --git a/Tests/LibWeb/Layout/expected/flex/calc-flex-basis.txt b/Tests/LibWeb/Layout/expected/flex/calc-flex-basis.txt
index 79c69ca624..54966fd94b 100644
--- a/Tests/LibWeb/Layout/expected/flex/calc-flex-basis.txt
+++ b/Tests/LibWeb/Layout/expected/flex/calc-flex-basis.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Item 4"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x82]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x64]
       PaintableBox (Box<DIV>.flex-container) [10,10 780x62]
diff --git a/Tests/LibWeb/Layout/expected/flex/cross-size-of-item-with-box-sizing-border-box-and-nonzero-padding.txt b/Tests/LibWeb/Layout/expected/flex/cross-size-of-item-with-box-sizing-border-box-and-nonzero-padding.txt
index 3506558430..a6c7ccc476 100644
--- a/Tests/LibWeb/Layout/expected/flex/cross-size-of-item-with-box-sizing-border-box-and-nonzero-padding.txt
+++ b/Tests/LibWeb/Layout/expected/flex/cross-size-of-item-with-box-sizing-border-box-and-nonzero-padding.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Pellentesque eget justo nulla. Duis consectetur imperdiet nisi, ac tincidunt urna blandit quis."
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x247.09375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x229.09375]
       PaintableBox (Box<DIV>.outer.flex.flex-wrap) [10,10 780x227.09375]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-column-container-with-max-width-max-content.txt b/Tests/LibWeb/Layout/expected/flex/flex-column-container-with-max-width-max-content.txt
index 15f870dd3a..51d4779cd4 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-column-container-with-max-width-max-content.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-column-container-with-max-width-max-content.txt
@@ -2,6 +2,6 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
   BlockContainer <html> at (0,0) content-size 800x16 [BFC] children: not-inline
     Box <body> at (8,8) content-size 0x0 flex-container(column) [FFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableBox (Box<BODY>) [8,8 0x0]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-intrinsic-aspect-ratio-and-percentage-max-width.txt b/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-intrinsic-aspect-ratio-and-percentage-max-width.txt
index 07cf07fc74..d7fdcaec11 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-intrinsic-aspect-ratio-and-percentage-max-width.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-intrinsic-aspect-ratio-and-percentage-max-width.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     Box <body> at (10,10) content-size 780x102 flex-container(column) [FFC] children: not-inline
       ImageBox <img> at (11,11) content-size 100x100 flex-item children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x122]
     PaintableBox (Box<BODY>) [9,9 782x104]
       ImagePaintable (ImageBox<IMG>) [10,10 102x102]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-natural-aspect-ratio-and-automatic-cross-size.txt b/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-natural-aspect-ratio-and-automatic-cross-size.txt
index a294ab096c..c1ebffb6e5 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-natural-aspect-ratio-and-automatic-cross-size.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-natural-aspect-ratio-and-automatic-cross-size.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (0,0) content-size 200x100 flex-item [SVG] children: not-inline
         SVGGeometryBox <rect> at (0,0) content-size 200x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x100]
     PaintableBox (Box<BODY>) [0,0 800x100]
       SVGSVGPaintable (SVGSVGBox<svg>) [0,0 200x100]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-percentage-max-width.txt b/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-percentage-max-width.txt
index 4119b2a720..89afdf2246 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-percentage-max-width.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-column-item-with-percentage-max-width.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x122]
     PaintableWithLines (BlockContainer<BODY>) [9,9 56x104]
       PaintableBox (Box<DIV>.flex) [10,10 54x102]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-container-intrinsic-cross-size-with-max-content-main-size.txt b/Tests/LibWeb/Layout/expected/flex/flex-container-intrinsic-cross-size-with-max-content-main-size.txt
index 7463de22d9..2664fb4380 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-container-intrinsic-cross-size-with-max-content-main-size.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-container-intrinsic-cross-size-with-max-content-main-size.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "this text should be all on one line"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x53.46875]
     PaintableWithLines (BlockContainer<BODY>.outer) [8,8 300.84375x37.46875]
       PaintableBox (Box<DIV>.inner) [18,18 280.84375x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-container-with-max-width-and-negative-margin-in-same-axis.txt b/Tests/LibWeb/Layout/expected/flex/flex-container-with-max-width-and-negative-margin-in-same-axis.txt
index 9674b0f9ad..9abf503896 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-container-with-max-width-and-negative-margin-in-same-axis.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-container-with-max-width-and-negative-margin-in-same-axis.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) [BFC] children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [-92,0 892x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [-92,0 892x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116] overflow: [-92,0 892x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100] overflow: [-92,8 884x100]
       PaintableWithLines (BlockContainer<DIV>#container-of-flex) [8,8 100x100] overflow: [-92,8 200x100]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-gap-between-items-and-lines.txt b/Tests/LibWeb/Layout/expected/flex/flex-gap-between-items-and-lines.txt
index 2bc26b1012..3d67fb5f70 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-gap-between-items-and-lines.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-gap-between-items-and-lines.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div> at (12,228) content-size 30x30 flex-item [BFC] children: not-inline
         BlockContainer <div> at (64,228) content-size 30x30 flex-item [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x252]
       PaintableBox (Box<DIV>.flexbox) [10,10 102x250]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-item-min-width-fit-content.txt b/Tests/LibWeb/Layout/expected/flex/flex-item-min-width-fit-content.txt
index 01e3a2010f..635c9d5678 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-item-min-width-fit-content.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-item-min-width-fit-content.txt
@@ -21,7 +21,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Reject"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x72]
     PaintableBox (Box<BODY>) [9,9 502x54]
       PaintableWithLines (BlockContainer<DIV>.big) [10,10 383.625x52]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-item-with-calc-main-size-and-layout-dependent-containing-block-size.txt b/Tests/LibWeb/Layout/expected/flex/flex-item-with-calc-main-size-and-layout-dependent-containing-block-size.txt
index c67f78b504..469d40616c 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-item-with-calc-main-size-and-layout-dependent-containing-block-size.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-item-with-calc-main-size-and-layout-dependent-containing-block-size.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "text"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x69.34375]
     PaintableBox (Box<BODY>.pink) [8,8 784x53.34375]
       PaintableBox (Box<DIV>.orange) [8,8 194.71875x53.34375]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-item-with-intrinsic-aspect-ratio-and-max-height.txt b/Tests/LibWeb/Layout/expected/flex/flex-item-with-intrinsic-aspect-ratio-and-max-height.txt
index 37f9a8574c..60501fb3a0 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-item-with-intrinsic-aspect-ratio-and-max-height.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-item-with-intrinsic-aspect-ratio-and-max-height.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> (not painted) [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x72]
     PaintableBox (Box<BODY>) [9,9 782x54]
       ImagePaintable (ImageBox<IMG>) [10,10 68.671875x52]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-row-reverse-with-centered-content.txt b/Tests/LibWeb/Layout/expected/flex/flex-row-reverse-with-centered-content.txt
index 3697016c39..2b15c749c2 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-row-reverse-with-centered-content.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-row-reverse-with-centered-content.txt
@@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "3"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x66]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x50]
       PaintableBox (Box<DIV>.flex) [8,8 784x50]
diff --git a/Tests/LibWeb/Layout/expected/flex/flex-shorthand-flex-basis-zero-percent.txt b/Tests/LibWeb/Layout/expected/flex/flex-shorthand-flex-basis-zero-percent.txt
index 263abadf8e..0fc21b3cfe 100644
--- a/Tests/LibWeb/Layout/expected/flex/flex-shorthand-flex-basis-zero-percent.txt
+++ b/Tests/LibWeb/Layout/expected/flex/flex-shorthand-flex-basis-zero-percent.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 "friends"
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x128]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x110]
       PaintableBox (Box<DIV>.flex) [10,10 502x54]
diff --git a/Tests/LibWeb/Layout/expected/flex/inf-available-space-with-auto-margins.txt b/Tests/LibWeb/Layout/expected/flex/inf-available-space-with-auto-margins.txt
index 5931cf8253..5c6714a41c 100644
--- a/Tests/LibWeb/Layout/expected/flex/inf-available-space-with-auto-margins.txt
+++ b/Tests/LibWeb/Layout/expected/flex/inf-available-space-with-auto-margins.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hmmMMMMmmmmmm"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableBox (Box<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<MAIN>) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/inline-flex-with-main-axis-margin-on-flex-container.txt b/Tests/LibWeb/Layout/expected/flex/inline-flex-with-main-axis-margin-on-flex-container.txt
index 9c358c2757..bf3148cefd 100644
--- a/Tests/LibWeb/Layout/expected/flex/inline-flex-with-main-axis-margin-on-flex-container.txt
+++ b/Tests/LibWeb/Layout/expected/flex/inline-flex-with-main-axis-margin-on-flex-container.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Immobilie inserieren"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 502x39.46875]
     PaintableBox (Box<BODY>) [9,9 164.40625x21.46875]
       PaintableWithLines (BlockContainer<DIV>) [10,10 162.40625x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-column-items-with-different-kinds-of-width.txt b/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-column-items-with-different-kinds-of-width.txt
index 948c2dedde..b91e6783b2 100644
--- a/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-column-items-with-different-kinds-of-width.txt
+++ b/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-column-items-with-different-kinds-of-width.txt
@@ -52,7 +52,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> (not painted) [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x145.28125]
     PaintableBox (Box<BODY>) [9,9 782x127.28125]
       PaintableWithLines (BlockContainer<DIV>.px) [10,10 202x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-flex-container-with-svg-item-that-only-has-natural-aspect-ratio.txt b/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-flex-container-with-svg-item-that-only-has-natural-aspect-ratio.txt
index 6e2e6f83d2..3f3508e559 100644
--- a/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-flex-container-with-svg-item-that-only-has-natural-aspect-ratio.txt
+++ b/Tests/LibWeb/Layout/expected/flex/intrinsic-height-of-flex-container-with-svg-item-that-only-has-natural-aspect-ratio.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (400,8) content-size 0x0 flex-item [SVG] children: not-inline
         SVGGeometryBox <rect> at (400,8) content-size 0x0 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableBox (Box<BODY>) [8,8 784x0]
       SVGSVGPaintable (SVGSVGBox<svg>) [400,8 0x0]
diff --git a/Tests/LibWeb/Layout/expected/flex/justify-content-1.txt b/Tests/LibWeb/Layout/expected/flex/justify-content-1.txt
index 1eb35610f6..3b763249c9 100644
--- a/Tests/LibWeb/Layout/expected/flex/justify-content-1.txt
+++ b/Tests/LibWeb/Layout/expected/flex/justify-content-1.txt
@@ -580,7 +580,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,5834) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x5844]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x5844]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x5844]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x5826]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/flex/justify-content-space-between-single-item.txt b/Tests/LibWeb/Layout/expected/flex/justify-content-space-between-single-item.txt
index ef5b7fcda8..c8b7bec561 100644
--- a/Tests/LibWeb/Layout/expected/flex/justify-content-space-between-single-item.txt
+++ b/Tests/LibWeb/Layout/expected/flex/justify-content-space-between-single-item.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "A"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/justify-content-with-margin-auto-child.txt b/Tests/LibWeb/Layout/expected/flex/justify-content-with-margin-auto-child.txt
index 1e6704a976..500ed5eb0e 100644
--- a/Tests/LibWeb/Layout/expected/flex/justify-content-with-margin-auto-child.txt
+++ b/Tests/LibWeb/Layout/expected/flex/justify-content-with-margin-auto-child.txt
@@ -292,7 +292,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,2922) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2932]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2932]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2932]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x2914]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/flex/list-container-display-contents.txt b/Tests/LibWeb/Layout/expected/flex/list-container-display-contents.txt
index 559bd71e66..56b0fcbbf4 100644
--- a/Tests/LibWeb/Layout/expected/flex/list-container-display-contents.txt
+++ b/Tests/LibWeb/Layout/expected/flex/list-container-display-contents.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Mac"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x41.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,16 784x17.46875]
       PaintableBox (Box<UL>.globalnav-list) [8,16 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/multi-line-column-container-with-automatic-height.txt b/Tests/LibWeb/Layout/expected/flex/multi-line-column-container-with-automatic-height.txt
index fe01a4d113..64d1eb3b93 100644
--- a/Tests/LibWeb/Layout/expected/flex/multi-line-column-container-with-automatic-height.txt
+++ b/Tests/LibWeb/Layout/expected/flex/multi-line-column-container-with-automatic-height.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div> at (12,64) content-size 50x50 flex-item [BFC] children: not-inline
         BlockContainer <div> at (12,116) content-size 50x50 flex-item [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x178]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x160]
       PaintableBox (Box<DIV>.flexbox) [10,10 202x158]
diff --git a/Tests/LibWeb/Layout/expected/flex/percentage-flex-basis-with-indefinite-flex-container-size.txt b/Tests/LibWeb/Layout/expected/flex/percentage-flex-basis-with-indefinite-flex-container-size.txt
index e2f8f860b8..7388b75277 100644
--- a/Tests/LibWeb/Layout/expected/flex/percentage-flex-basis-with-indefinite-flex-container-size.txt
+++ b/Tests/LibWeb/Layout/expected/flex/percentage-flex-basis-with-indefinite-flex-container-size.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "percentages are hard"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableBox (Box<BODY>.outer) [8,8 200x17.46875]
       PaintableWithLines (BlockContainer<DIV>.middle) [8,8 200x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/relpos-flex-item.txt b/Tests/LibWeb/Layout/expected/flex/relpos-flex-item.txt
index 4939ac61a1..ce9cf85ba4 100644
--- a/Tests/LibWeb/Layout/expected/flex/relpos-flex-item.txt
+++ b/Tests/LibWeb/Layout/expected/flex/relpos-flex-item.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "athena"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x45.46875]
     PaintableBox (Box<BODY>) [10,10 604x25.46875] overflow: [12,12 600x25.46875]
       PaintableWithLines (BlockContainer<DIV>.exekiller) [12,12 204x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/flex/reverse-flex-layout-with-space-between-and-space-around.txt b/Tests/LibWeb/Layout/expected/flex/reverse-flex-layout-with-space-between-and-space-around.txt
index 3c62baeba2..41a5d753a3 100644
--- a/Tests/LibWeb/Layout/expected/flex/reverse-flex-layout-with-space-between-and-space-around.txt
+++ b/Tests/LibWeb/Layout/expected/flex/reverse-flex-layout-with-space-between-and-space-around.txt
@@ -72,7 +72,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "friends"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x616]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x600]
       PaintableBox (Box<DIV>.outer.row) [8,8 150x150]
diff --git a/Tests/LibWeb/Layout/expected/flex/specified-size-suggestion-with-box-sizing-border-box.txt b/Tests/LibWeb/Layout/expected/flex/specified-size-suggestion-with-box-sizing-border-box.txt
index 9f38c742e2..f4ae2b6b9c 100644
--- a/Tests/LibWeb/Layout/expected/flex/specified-size-suggestion-with-box-sizing-border-box.txt
+++ b/Tests/LibWeb/Layout/expected/flex/specified-size-suggestion-with-box-sizing-border-box.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       ImageBox <img> at (0,0) content-size 400x100 flex-item children: not-inline
       ImageBox <img.padded> at (600,0) content-size 200x100 flex-item children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x100]
     PaintableBox (Box<BODY>) [0,0 800x100]
       ImagePaintable (ImageBox<IMG>) [0,0 400x100]
diff --git a/Tests/LibWeb/Layout/expected/flex/stretch-alignment-with-cross-gap.txt b/Tests/LibWeb/Layout/expected/flex/stretch-alignment-with-cross-gap.txt
index 755653257d..35a12d3f5c 100644
--- a/Tests/LibWeb/Layout/expected/flex/stretch-alignment-with-cross-gap.txt
+++ b/Tests/LibWeb/Layout/expected/flex/stretch-alignment-with-cross-gap.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div> at (12,178.65625) content-size 100x20 flex-item [BFC] children: not-inline
         BlockContainer <div> at (114,178.65625) content-size 100x20 flex-item [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x222]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x204]
       PaintableBox (Box<DIV>.flex) [10,10 302x202]
diff --git a/Tests/LibWeb/Layout/expected/floating-non-replaced-element-percentage-padding-against-indefinite-width.txt b/Tests/LibWeb/Layout/expected/floating-non-replaced-element-percentage-padding-against-indefinite-width.txt
index f6ab4106d7..17906087f9 100644
--- a/Tests/LibWeb/Layout/expected/floating-non-replaced-element-percentage-padding-against-indefinite-width.txt
+++ b/Tests/LibWeb/Layout/expected/floating-non-replaced-element-percentage-padding-against-indefinite-width.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div> at (8,8) content-size 0x0 flex-item [BFC] children: not-inline
           Box <div#box2> at (8,8) content-size 0x0 floating flex-container(row) [FFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableBox (Box<DIV>#box1) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/floating-replaced-element-percentage-padding-against-indefinite-width.txt b/Tests/LibWeb/Layout/expected/floating-replaced-element-percentage-padding-against-indefinite-width.txt
index 6d01d37867..9dad895203 100644
--- a/Tests/LibWeb/Layout/expected/floating-replaced-element-percentage-padding-against-indefinite-width.txt
+++ b/Tests/LibWeb/Layout/expected/floating-replaced-element-percentage-padding-against-indefinite-width.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div> at (8,8) content-size 16x64 flex-item [BFC] children: not-inline
           ImageBox <img#box2> at (24,24) content-size 16x32 floating flex-container(row) children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x80]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x64]
       PaintableBox (Box<DIV>#box1) [8,8 784x64]
diff --git a/Tests/LibWeb/Layout/expected/font-with-many-normal-values.txt b/Tests/LibWeb/Layout/expected/font-with-many-normal-values.txt
index 64ce81f11e..c10b837cc2 100644
--- a/Tests/LibWeb/Layout/expected/font-with-many-normal-values.txt
+++ b/Tests/LibWeb/Layout/expected/font-with-many-normal-values.txt
@@ -29,7 +29,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x216]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       InlinePaintable (InlineNode<SPAN>.one)
diff --git a/Tests/LibWeb/Layout/expected/getComputedStyle-on-unconnected-element.txt b/Tests/LibWeb/Layout/expected/getComputedStyle-on-unconnected-element.txt
index 11a3cfde48..17e3a3247b 100644
--- a/Tests/LibWeb/Layout/expected/getComputedStyle-on-unconnected-element.txt
+++ b/Tests/LibWeb/Layout/expected/getComputedStyle-on-unconnected-element.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           "This test passes if we don't crash."
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x37.84375]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.84375]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/grid/abspos-item.txt b/Tests/LibWeb/Layout/expected/grid/abspos-item.txt
index 0d0c994747..8a0dae5031 100644
--- a/Tests/LibWeb/Layout/expected/grid/abspos-item.txt
+++ b/Tests/LibWeb/Layout/expected/grid/abspos-item.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "more text"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.outer-grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/align-items.txt b/Tests/LibWeb/Layout/expected/grid/align-items.txt
index 81b20262dd..772eee678f 100644
--- a/Tests/LibWeb/Layout/expected/grid/align-items.txt
+++ b/Tests/LibWeb/Layout/expected/grid/align-items.txt
@@ -41,7 +41,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "End2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x264.40625]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x246.40625]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/grid/align-self.txt b/Tests/LibWeb/Layout/expected/grid/align-self.txt
index 5a9a1d3b9d..2b8e8239a5 100644
--- a/Tests/LibWeb/Layout/expected/grid/align-self.txt
+++ b/Tests/LibWeb/Layout/expected/grid/align-self.txt
@@ -41,7 +41,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "End2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x264.40625]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x246.40625]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/grid/all-implicit-rows.txt b/Tests/LibWeb/Layout/expected/grid/all-implicit-rows.txt
index 858eafda17..3e9844f8d7 100644
--- a/Tests/LibWeb/Layout/expected/grid/all-implicit-rows.txt
+++ b/Tests/LibWeb/Layout/expected/grid/all-implicit-rows.txt
@@ -35,7 +35,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,208) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x200]
diff --git a/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt b/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt
index cb766533e8..c5e85a44b1 100644
--- a/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt
+++ b/Tests/LibWeb/Layout/expected/grid/anonymous-inline-child.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "hello"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/auto-fill.txt b/Tests/LibWeb/Layout/expected/grid/auto-fill.txt
index 1dac103ef4..43e6f9ceb9 100644
--- a/Tests/LibWeb/Layout/expected/grid/auto-fill.txt
+++ b/Tests/LibWeb/Layout/expected/grid/auto-fill.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/auto-fit-collapse-empty-tracks.txt b/Tests/LibWeb/Layout/expected/grid/auto-fit-collapse-empty-tracks.txt
index e75feb4755..d694c16dd9 100644
--- a/Tests/LibWeb/Layout/expected/grid/auto-fit-collapse-empty-tracks.txt
+++ b/Tests/LibWeb/Layout/expected/grid/auto-fit-collapse-empty-tracks.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "1"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x97.46875]
       PaintableBox (Box<DIV>.container) [8,8 784x97.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/auto-fit.txt b/Tests/LibWeb/Layout/expected/grid/auto-fit.txt
index 1dac103ef4..43e6f9ceb9 100644
--- a/Tests/LibWeb/Layout/expected/grid/auto-fit.txt
+++ b/Tests/LibWeb/Layout/expected/grid/auto-fit.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/auto-track-sizes.txt b/Tests/LibWeb/Layout/expected/grid/auto-track-sizes.txt
index cec50a063a..80eabddad9 100644
--- a/Tests/LibWeb/Layout/expected/grid/auto-track-sizes.txt
+++ b/Tests/LibWeb/Layout/expected/grid/auto-track-sizes.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div#c3> at (8,8) content-size 83x41 [BFC] children: not-inline
         BlockContainer <div#c4> at (8,8) content-size 120x60 [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x60]
       PaintableBox (Box<DIV>.grid) [8,8 784x60]
diff --git a/Tests/LibWeb/Layout/expected/grid/basic-2.txt b/Tests/LibWeb/Layout/expected/grid/basic-2.txt
index 905052cb42..75d4de1d5c 100644
--- a/Tests/LibWeb/Layout/expected/grid/basic-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/basic-2.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Board"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>#grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/basic.txt b/Tests/LibWeb/Layout/expected/grid/basic.txt
index c2502bde07..af553cd24e 100644
--- a/Tests/LibWeb/Layout/expected/grid/basic.txt
+++ b/Tests/LibWeb/Layout/expected/grid/basic.txt
@@ -33,7 +33,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/borders.txt b/Tests/LibWeb/Layout/expected/grid/borders.txt
index c680b9f344..e00f6883f3 100644
--- a/Tests/LibWeb/Layout/expected/grid/borders.txt
+++ b/Tests/LibWeb/Layout/expected/grid/borders.txt
@@ -163,7 +163,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x428.28125] overflow: [8,8 784x435.75]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x74.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/calc-track-size.txt b/Tests/LibWeb/Layout/expected/grid/calc-track-size.txt
index 546c447684..7732c03458 100644
--- a/Tests/LibWeb/Layout/expected/grid/calc-track-size.txt
+++ b/Tests/LibWeb/Layout/expected/grid/calc-track-size.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,25.46875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/column-1fr-1fr.txt b/Tests/LibWeb/Layout/expected/grid/column-1fr-1fr.txt
index 0be8026161..f3e19c40d5 100644
--- a/Tests/LibWeb/Layout/expected/grid/column-1fr-1fr.txt
+++ b/Tests/LibWeb/Layout/expected/grid/column-1fr-1fr.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.test> at (8,8) content-size 100x100 [BFC] children: not-inline
           BlockContainer <div.big-child> at (8,8) content-size 500x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableBox (Box<DIV>.grid) [8,8 100x100] overflow: [8,8 500x100]
diff --git a/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt b/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt
index b92aa02888..27b9e885ad 100644
--- a/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt
+++ b/Tests/LibWeb/Layout/expected/grid/column-auto-auto.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div.test> at (8,8) content-size 500x100 [BFC] children: not-inline
           BlockContainer <div.big-child> at (8,8) content-size 500x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableBox (Box<DIV>.grid) [8,8 100x100] overflow: [8,8 500x100]
diff --git a/Tests/LibWeb/Layout/expected/grid/different-column-sizes.txt b/Tests/LibWeb/Layout/expected/grid/different-column-sizes.txt
index 7254ad2f4a..7c6f777afa 100644
--- a/Tests/LibWeb/Layout/expected/grid/different-column-sizes.txt
+++ b/Tests/LibWeb/Layout/expected/grid/different-column-sizes.txt
@@ -33,7 +33,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/distribute-extra-space-across-spanned-tracks.txt b/Tests/LibWeb/Layout/expected/grid/distribute-extra-space-across-spanned-tracks.txt
index a12748dee1..0f29a50fd1 100644
--- a/Tests/LibWeb/Layout/expected/grid/distribute-extra-space-across-spanned-tracks.txt
+++ b/Tests/LibWeb/Layout/expected/grid/distribute-extra-space-across-spanned-tracks.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,25.46875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/float-container-columns-1fr-1fr.txt b/Tests/LibWeb/Layout/expected/grid/float-container-columns-1fr-1fr.txt
index 409e6b0640..fcc0ab914c 100644
--- a/Tests/LibWeb/Layout/expected/grid/float-container-columns-1fr-1fr.txt
+++ b/Tests/LibWeb/Layout/expected/grid/float-container-columns-1fr-1fr.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "goes-there"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 203.28125x34.9375]
       PaintableBox (Box<DIV>.container) [8,8 203.28125x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/floating-table-wrapper-width.txt b/Tests/LibWeb/Layout/expected/grid/floating-table-wrapper-width.txt
index 2c8b356364..9b69068bec 100644
--- a/Tests/LibWeb/Layout/expected/grid/floating-table-wrapper-width.txt
+++ b/Tests/LibWeb/Layout/expected/grid/floating-table-wrapper-width.txt
@@ -30,7 +30,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,35.46875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x27.46875]
       PaintableBox (Box<DIV>.grid) [8,8 784x27.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt b/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt
index b4da5cce16..6d16fc2c78 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-gap-1.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "4"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x84.9375]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x84.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt b/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt
index 60217f694c..4f32ac5d33 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-gap-2.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x50.9375]
       PaintableBox (Box<DIV>.container) [8,8 784x50.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt b/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt
index 4301c8fb13..00a1c93617 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-gap-3.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "1"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-paddings.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-paddings.txt
index a4090f0252..41f593612e 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-paddings.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-paddings.txt
@@ -35,7 +35,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,363.5) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x355.5]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x355.5]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-size.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-size.txt
index de4f19cfd9..c3d276760e 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-size.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-fixed-size.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "First"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x200]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-horizontal-margins-auto.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-horizontal-margins-auto.txt
index 611af9c88d..d40f035d92 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-horizontal-margins-auto.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-horizontal-margins-auto.txt
@@ -115,7 +115,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,450.28125) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x460.28125]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x442.28125]
       PaintableBox (Box<DIV>.grid) [10,10 502x440.28125] overflow: [11,11 501.109375x438.28125]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-min-size.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-min-size.txt
index ff9aa63c90..3957780e78 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-min-size.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-min-size.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "second"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 102x204]
       PaintableBox (Box<DIV>.grid) [8,8 102x204]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-margins.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-margins.txt
index 6a507e4021..00803e9564 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-margins.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-margins.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 "A filthy t-shirt"
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width-2.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width-2.txt
index 54d365b0d9..8562aa02f1 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width-2.txt
@@ -59,7 +59,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "tellus."
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 200x315.40625]
       PaintableBox (Box<DIV>.container) [8,8 200x315.40625]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width.txt
index a5ff688ebd..ff027b1685 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-percentage-width.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Second"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-item-with-fit-content-width.txt b/Tests/LibWeb/Layout/expected/grid/grid-item-with-fit-content-width.txt
index 97dd1e23f6..2755e5b1d1 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-item-with-fit-content-width.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-item-with-fit-content-width.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Press and Media"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x39.46875]
     PaintableBox (Box<BODY>) [9,9 782x21.46875]
       PaintableWithLines (BlockContainer<DIV>.inner) [10,10 134.828125x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-row-height-affected-by-item-margins.txt b/Tests/LibWeb/Layout/expected/grid/grid-row-height-affected-by-item-margins.txt
index 6f6c7cb22f..038cddf224 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-row-height-affected-by-item-margins.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-row-height-affected-by-item-margins.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Null publishes fine indie games"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x99.8125]
     PaintableBox (Box<BODY>) [9,9 782x81.8125]
       PaintableWithLines (BlockContainer<H1>) [54.5,31.4375 691x36.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-shorthand-property.txt b/Tests/LibWeb/Layout/expected/grid/grid-shorthand-property.txt
index f6ebb15d75..086e998934 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-shorthand-property.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-shorthand-property.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       Box <div.container> at (8,8) content-size 784x100 [GFC] children: not-inline
         BlockContainer <div.item> at (8,8) content-size 200x100 [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableBox (Box<DIV>.container) [8,8 784x100]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-span-4.txt b/Tests/LibWeb/Layout/expected/grid/grid-span-4.txt
index a7440acd38..a9a0f16a75 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-span-4.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-span-4.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "bar"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x67.65625]
     PaintableBox (Box<BODY>) [9,9 782x49.65625]
       PaintableWithLines (BlockContainer<DIV>.foo) [10,10 780x23.8125] overflow: [11,11 778x21.84375]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-template-areas-basics.txt b/Tests/LibWeb/Layout/expected/grid/grid-template-areas-basics.txt
index f3e2d66199..040fc4844b 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-template-areas-basics.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-template-areas-basics.txt
@@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "right-top"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableBox (Box<DIV>.container) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-template-columns-with-min-css-function.txt b/Tests/LibWeb/Layout/expected/grid/grid-template-columns-with-min-css-function.txt
index 8973e1dde8..5088b77f7f 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-template-columns-with-min-css-function.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-template-columns-with-min-css-function.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hello friends"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x56.9375]
     PaintableBox (Box<BODY>) [9,9 782x38.9375]
       PaintableWithLines (BlockContainer<H1>) [54.5,10 691x36.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/grid-template.txt b/Tests/LibWeb/Layout/expected/grid/grid-template.txt
index 470cc76c22..7b425366fb 100644
--- a/Tests/LibWeb/Layout/expected/grid/grid-template.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grid-template.txt
@@ -53,7 +53,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,208) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableBox (Box<DIV>.mw-page-container-inner) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/grid/grow-beyond-limits.txt b/Tests/LibWeb/Layout/expected/grid/grow-beyond-limits.txt
index ca4e2189fb..6820fffbc2 100644
--- a/Tests/LibWeb/Layout/expected/grid/grow-beyond-limits.txt
+++ b/Tests/LibWeb/Layout/expected/grid/grow-beyond-limits.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "one"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/image-in-grid.txt b/Tests/LibWeb/Layout/expected/grid/image-in-grid.txt
index 524ada611e..876d3d6498 100644
--- a/Tests/LibWeb/Layout/expected/grid/image-in-grid.txt
+++ b/Tests/LibWeb/Layout/expected/grid/image-in-grid.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x24.015625]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x24.015625]
diff --git a/Tests/LibWeb/Layout/expected/grid/inline-grid-simple.txt b/Tests/LibWeb/Layout/expected/grid/inline-grid-simple.txt
index 7ad6dfc989..44dfcbfcfc 100644
--- a/Tests/LibWeb/Layout/expected/grid/inline-grid-simple.txt
+++ b/Tests/LibWeb/Layout/expected/grid/inline-grid-simple.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "whf"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableBox (Box<BODY>) [8,8 26.953125x17.46875]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 26.953125x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-column.txt b/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-column.txt
index b4a43e7a57..2a5907f941 100644
--- a/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-column.txt
+++ b/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-column.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "whee"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x35.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 20x19.46875] overflow: [8,8 38.953125x19.46875]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 20x0]
diff --git a/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid-2.txt b/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid-2.txt
index 43ebcaf354..252cc8faf3 100644
--- a/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid-2.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "yeehaw"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x32.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x2] overflow: [10,10 98.421875x21.46875]
       PaintableBox (Box<DIV>.grid) [10,10 98.421875x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid.txt b/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid.txt
index d015ea4900..626621d323 100644
--- a/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid.txt
+++ b/Tests/LibWeb/Layout/expected/grid/intrinsic-sized-grid.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "whee"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x41.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 43.953125x23.46875]
       PaintableBox (Box<DIV>.grid) [10,10 41.953125x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt b/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt
index 89977142da..4301097e4e 100644
--- a/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/item-column-span-2.txt
@@ -20,7 +20,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,43.40625) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x35.40625]
       PaintableBox (Box<DIV>.container) [8,8 784x35.40625]
diff --git a/Tests/LibWeb/Layout/expected/grid/item-min-max-percentage-width.txt b/Tests/LibWeb/Layout/expected/grid/item-min-max-percentage-width.txt
index ba2f3ce16a..61a087e716 100644
--- a/Tests/LibWeb/Layout/expected/grid/item-min-max-percentage-width.txt
+++ b/Tests/LibWeb/Layout/expected/grid/item-min-max-percentage-width.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "mincontent"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x23.46875]
       PaintableBox (Box<DIV>.grid-container) [10,10 780x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/item-span-exceeds-columns-size.txt b/Tests/LibWeb/Layout/expected/grid/item-span-exceeds-columns-size.txt
index 6e7244ef1c..7e579fd182 100644
--- a/Tests/LibWeb/Layout/expected/grid/item-span-exceeds-columns-size.txt
+++ b/Tests/LibWeb/Layout/expected/grid/item-span-exceeds-columns-size.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       Box <div.container> at (8,8) content-size 300x100 [GFC] children: not-inline
         BlockContainer <div.item> at (8,8) content-size 300x100 [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableBox (Box<DIV>.container) [8,8 300x100]
diff --git a/Tests/LibWeb/Layout/expected/grid/justify-items.txt b/Tests/LibWeb/Layout/expected/grid/justify-items.txt
index 6b786f3e14..b2e1e14945 100644
--- a/Tests/LibWeb/Layout/expected/grid/justify-items.txt
+++ b/Tests/LibWeb/Layout/expected/grid/justify-items.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "End"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x84.40625]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x66.40625]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/grid/justify-self.txt b/Tests/LibWeb/Layout/expected/grid/justify-self.txt
index abfb8c0fab..824e355470 100644
--- a/Tests/LibWeb/Layout/expected/grid/justify-self.txt
+++ b/Tests/LibWeb/Layout/expected/grid/justify-self.txt
@@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> (not painted) [BFC] children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x78.40625]
     PaintableBox (Box<BODY>) [9,9 782x60.40625]
       PaintableWithLines (BlockContainer<DIV>) [10,10 45.859375x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/justify-start-min-width.txt b/Tests/LibWeb/Layout/expected/grid/justify-start-min-width.txt
index a43c9d38d3..ddcf7a3a9b 100644
--- a/Tests/LibWeb/Layout/expected/grid/justify-start-min-width.txt
+++ b/Tests/LibWeb/Layout/expected/grid/justify-start-min-width.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Start Selling"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>#grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/min-max-content.txt b/Tests/LibWeb/Layout/expected/grid/min-max-content.txt
index 6b9c3d748c..157e9e89be 100644
--- a/Tests/LibWeb/Layout/expected/grid/min-max-content.txt
+++ b/Tests/LibWeb/Layout/expected/grid/min-max-content.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/minmax-1.txt b/Tests/LibWeb/Layout/expected/grid/minmax-1.txt
index 0d0187340d..c3c754dfd7 100644
--- a/Tests/LibWeb/Layout/expected/grid/minmax-1.txt
+++ b/Tests/LibWeb/Layout/expected/grid/minmax-1.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/minmax-2.txt b/Tests/LibWeb/Layout/expected/grid/minmax-2.txt
index 4b5e7433ec..378b5bd92b 100644
--- a/Tests/LibWeb/Layout/expected/grid/minmax-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/minmax-2.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableBox (Box<DIV>.container) [8,8 784x100]
diff --git a/Tests/LibWeb/Layout/expected/grid/minmax-3.txt b/Tests/LibWeb/Layout/expected/grid/minmax-3.txt
index 0e39cb1bb0..05e331ca11 100644
--- a/Tests/LibWeb/Layout/expected/grid/minmax-3.txt
+++ b/Tests/LibWeb/Layout/expected/grid/minmax-3.txt
@@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "3"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/minmax-auto-track-definition.txt b/Tests/LibWeb/Layout/expected/grid/minmax-auto-track-definition.txt
index f5ae41e063..9f540eac76 100644
--- a/Tests/LibWeb/Layout/expected/grid/minmax-auto-track-definition.txt
+++ b/Tests/LibWeb/Layout/expected/grid/minmax-auto-track-definition.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       Box <div.grid> at (8,8) content-size 200x200 [GFC] children: not-inline
         BlockContainer <div.item> at (8,8) content-size 100x100 [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableBox (Box<DIV>.grid) [8,8 200x200]
diff --git a/Tests/LibWeb/Layout/expected/grid/minmax-invalid-1.txt b/Tests/LibWeb/Layout/expected/grid/minmax-invalid-1.txt
index d3056b1ea5..be3e60d153 100644
--- a/Tests/LibWeb/Layout/expected/grid/minmax-invalid-1.txt
+++ b/Tests/LibWeb/Layout/expected/grid/minmax-invalid-1.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableBox (Box<DIV>.container) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/minmax-with-max-function-inside.txt b/Tests/LibWeb/Layout/expected/grid/minmax-with-max-function-inside.txt
index 855acfeb79..cb986ed53d 100644
--- a/Tests/LibWeb/Layout/expected/grid/minmax-with-max-function-inside.txt
+++ b/Tests/LibWeb/Layout/expected/grid/minmax-with-max-function-inside.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "d"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableBox (Box<DIV>.grid) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/named-tracks.txt b/Tests/LibWeb/Layout/expected/grid/named-tracks.txt
index 4f3d4807f5..d2b7c38c93 100644
--- a/Tests/LibWeb/Layout/expected/grid/named-tracks.txt
+++ b/Tests/LibWeb/Layout/expected/grid/named-tracks.txt
@@ -89,7 +89,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+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]
diff --git a/Tests/LibWeb/Layout/expected/grid/negative-grid-item-column-index.txt b/Tests/LibWeb/Layout/expected/grid/negative-grid-item-column-index.txt
index 8d2b0239ba..de4ee01994 100644
--- a/Tests/LibWeb/Layout/expected/grid/negative-grid-item-column-index.txt
+++ b/Tests/LibWeb/Layout/expected/grid/negative-grid-item-column-index.txt
@@ -70,7 +70,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,77.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x69.875]
       PaintableBox (Box<DIV>.grid) [8,8 784x69.875]
diff --git a/Tests/LibWeb/Layout/expected/grid/order.txt b/Tests/LibWeb/Layout/expected/grid/order.txt
index fa3e0afd6e..47bdaad911 100644
--- a/Tests/LibWeb/Layout/expected/grid/order.txt
+++ b/Tests/LibWeb/Layout/expected/grid/order.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,114) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x106]
       PaintableBox (Box<DIV>.grid-container) [10,10 780x104]
diff --git a/Tests/LibWeb/Layout/expected/grid/place-items-center.txt b/Tests/LibWeb/Layout/expected/grid/place-items-center.txt
index 4cae537029..b2da9b0a45 100644
--- a/Tests/LibWeb/Layout/expected/grid/place-items-center.txt
+++ b/Tests/LibWeb/Layout/expected/grid/place-items-center.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Download"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x39.46875]
     PaintableBox (Box<BODY>) [9,9 782x21.46875]
       PaintableWithLines (BlockContainer<DIV>) [361.9375,10 76.125x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/place-self.txt b/Tests/LibWeb/Layout/expected/grid/place-self.txt
index 6cf79b9c11..707c698da5 100644
--- a/Tests/LibWeb/Layout/expected/grid/place-self.txt
+++ b/Tests/LibWeb/Layout/expected/grid/place-self.txt
@@ -39,7 +39,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "End2"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x264.40625]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x246.40625]
       PaintableBox (Box<DIV>.grid) [10,10 780x81.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/positions-and-spans.txt b/Tests/LibWeb/Layout/expected/grid/positions-and-spans.txt
index 47cf16f1a9..8125795209 100644
--- a/Tests/LibWeb/Layout/expected/grid/positions-and-spans.txt
+++ b/Tests/LibWeb/Layout/expected/grid/positions-and-spans.txt
@@ -82,7 +82,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x169.875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/relpos-grid-item.txt b/Tests/LibWeb/Layout/expected/grid/relpos-grid-item.txt
index e3e2e844d1..fe280344c3 100644
--- a/Tests/LibWeb/Layout/expected/grid/relpos-grid-item.txt
+++ b/Tests/LibWeb/Layout/expected/grid/relpos-grid-item.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "athena"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x66.9375]
     PaintableBox (Box<BODY>) [10,10 604x46.9375]
       PaintableWithLines (BlockContainer<DIV>.exekiller) [12,12 204x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/repeat.txt b/Tests/LibWeb/Layout/expected/grid/repeat.txt
index b4945c294b..8c10cd1e89 100644
--- a/Tests/LibWeb/Layout/expected/grid/repeat.txt
+++ b/Tests/LibWeb/Layout/expected/grid/repeat.txt
@@ -82,7 +82,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x217.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x200]
diff --git a/Tests/LibWeb/Layout/expected/grid/row-1fr.txt b/Tests/LibWeb/Layout/expected/grid/row-1fr.txt
index a0c8b728eb..a355fd14f4 100644
--- a/Tests/LibWeb/Layout/expected/grid/row-1fr.txt
+++ b/Tests/LibWeb/Layout/expected/grid/row-1fr.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     Box <body> at (10,10) content-size 200x52 [GFC] children: not-inline
       BlockContainer <div.item> at (11,11) content-size 100x50 [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x72]
     PaintableBox (Box<BODY>) [9,9 202x54]
       PaintableWithLines (BlockContainer<DIV>.item) [10,10 102x52]
diff --git a/Tests/LibWeb/Layout/expected/grid/row-height.txt b/Tests/LibWeb/Layout/expected/grid/row-height.txt
index f11fc95a9c..1f50fe82c0 100644
--- a/Tests/LibWeb/Layout/expected/grid/row-height.txt
+++ b/Tests/LibWeb/Layout/expected/grid/row-height.txt
@@ -33,7 +33,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x67.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x67.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/row-span-2-maxcontent.txt b/Tests/LibWeb/Layout/expected/grid/row-span-2-maxcontent.txt
index e41d99edea..cfac8b4a48 100644
--- a/Tests/LibWeb/Layout/expected/grid/row-span-2-maxcontent.txt
+++ b/Tests/LibWeb/Layout/expected/grid/row-span-2-maxcontent.txt
@@ -104,7 +104,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x315.40625] overflow: [8,8 785.46875x315.40625]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x315.40625] overflow: [8,8 785.46875x315.40625]
diff --git a/Tests/LibWeb/Layout/expected/grid/row-span-2-mincontent.txt b/Tests/LibWeb/Layout/expected/grid/row-span-2-mincontent.txt
index d1f9c63eb5..de68c07402 100644
--- a/Tests/LibWeb/Layout/expected/grid/row-span-2-mincontent.txt
+++ b/Tests/LibWeb/Layout/expected/grid/row-span-2-mincontent.txt
@@ -185,7 +185,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x560.0625]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x560.0625]
diff --git a/Tests/LibWeb/Layout/expected/grid/row-span-2-with-gaps.txt b/Tests/LibWeb/Layout/expected/grid/row-span-2-with-gaps.txt
index 4bc3af64c5..9912c2aca0 100644
--- a/Tests/LibWeb/Layout/expected/grid/row-span-2-with-gaps.txt
+++ b/Tests/LibWeb/Layout/expected/grid/row-span-2-with-gaps.txt
@@ -107,7 +107,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x352.34375] overflow: [8,8 785.46875x352.34375]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x352.34375] overflow: [8,8 785.46875x352.34375]
diff --git a/Tests/LibWeb/Layout/expected/grid/row-span-2.txt b/Tests/LibWeb/Layout/expected/grid/row-span-2.txt
index e41d99edea..cfac8b4a48 100644
--- a/Tests/LibWeb/Layout/expected/grid/row-span-2.txt
+++ b/Tests/LibWeb/Layout/expected/grid/row-span-2.txt
@@ -104,7 +104,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> (not painted) [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x315.40625] overflow: [8,8 785.46875x315.40625]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x315.40625] overflow: [8,8 785.46875x315.40625]
diff --git a/Tests/LibWeb/Layout/expected/grid/rows-1fr-1fr.txt b/Tests/LibWeb/Layout/expected/grid/rows-1fr-1fr.txt
index e4e007f080..59e949472a 100644
--- a/Tests/LibWeb/Layout/expected/grid/rows-1fr-1fr.txt
+++ b/Tests/LibWeb/Layout/expected/grid/rows-1fr-1fr.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,42.9375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x34.9375]
       PaintableBox (Box<DIV>.container) [8,8 784x34.9375]
diff --git a/Tests/LibWeb/Layout/expected/grid/should-not-cause-infinite-spinning-in-space-distribution.txt b/Tests/LibWeb/Layout/expected/grid/should-not-cause-infinite-spinning-in-space-distribution.txt
index e5796a2c00..0896149a1d 100644
--- a/Tests/LibWeb/Layout/expected/grid/should-not-cause-infinite-spinning-in-space-distribution.txt
+++ b/Tests/LibWeb/Layout/expected/grid/should-not-cause-infinite-spinning-in-space-distribution.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "bar"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x58.90625]
     PaintableBox (Box<BODY>) [9,9 782x40.90625]
       PaintableWithLines (BlockContainer<DIV>.foo) [10,10 780x19.4375] overflow: [11,11 778x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/template-lines-and-areas.txt b/Tests/LibWeb/Layout/expected/grid/template-lines-and-areas.txt
index 3394540ba1..d45f449a2c 100644
--- a/Tests/LibWeb/Layout/expected/grid/template-lines-and-areas.txt
+++ b/Tests/LibWeb/Layout/expected/grid/template-lines-and-areas.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "1fr"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/track-size-calc-with-percentage.txt b/Tests/LibWeb/Layout/expected/grid/track-size-calc-with-percentage.txt
index 857b423137..2727830eda 100644
--- a/Tests/LibWeb/Layout/expected/grid/track-size-calc-with-percentage.txt
+++ b/Tests/LibWeb/Layout/expected/grid/track-size-calc-with-percentage.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 "The 10 Most Anticipated Summer Movies of 2023"
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.ipc-page-grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/two-items-spanning-one-1fr-row.txt b/Tests/LibWeb/Layout/expected/grid/two-items-spanning-one-1fr-row.txt
index efb2676e2b..e7bec32190 100644
--- a/Tests/LibWeb/Layout/expected/grid/two-items-spanning-one-1fr-row.txt
+++ b/Tests/LibWeb/Layout/expected/grid/two-items-spanning-one-1fr-row.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "bar"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x122]
     PaintableBox (Box<BODY>) [9,9 782x104]
       PaintableWithLines (BlockContainer<DIV>.foo) [10,10 102x102]
diff --git a/Tests/LibWeb/Layout/expected/grid/unresolvable-percentage-track.txt b/Tests/LibWeb/Layout/expected/grid/unresolvable-percentage-track.txt
index 4d463cf5ac..6f3727fed0 100644
--- a/Tests/LibWeb/Layout/expected/grid/unresolvable-percentage-track.txt
+++ b/Tests/LibWeb/Layout/expected/grid/unresolvable-percentage-track.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 "hello"
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.ipc-page-grid) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/valid-grid-areas-1.txt b/Tests/LibWeb/Layout/expected/grid/valid-grid-areas-1.txt
index 5dbde018b8..80f984b4b5 100644
--- a/Tests/LibWeb/Layout/expected/grid/valid-grid-areas-1.txt
+++ b/Tests/LibWeb/Layout/expected/grid/valid-grid-areas-1.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "1fr"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableBox (Box<DIV>.grid-container) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/grid/vertical-margins-auto.txt b/Tests/LibWeb/Layout/expected/grid/vertical-margins-auto.txt
index 17ce30c9d6..11f7e2c6db 100644
--- a/Tests/LibWeb/Layout/expected/grid/vertical-margins-auto.txt
+++ b/Tests/LibWeb/Layout/expected/grid/vertical-margins-auto.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "item"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x522]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x504]
       PaintableBox (Box<DIV>.container) [10,10 502x502]
diff --git a/Tests/LibWeb/Layout/expected/height-of-absolute-position-box-with-padding.txt b/Tests/LibWeb/Layout/expected/height-of-absolute-position-box-with-padding.txt
index afd2a1654d..3fdbf9684a 100644
--- a/Tests/LibWeb/Layout/expected/height-of-absolute-position-box-with-padding.txt
+++ b/Tests/LibWeb/Layout/expected/height-of-absolute-position-box-with-padding.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/image-display-block-margin-auto.txt b/Tests/LibWeb/Layout/expected/image-display-block-margin-auto.txt
index e5842440e4..562e9d47a2 100644
--- a/Tests/LibWeb/Layout/expected/image-display-block-margin-auto.txt
+++ b/Tests/LibWeb/Layout/expected/image-display-block-margin-auto.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 400x100 children: not-inline
       ImageBox <img> at (158,8) content-size 100x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 400x100]
       ImagePaintable (ImageBox<IMG>) [158,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/image-with-multiple-constraint-violations.txt b/Tests/LibWeb/Layout/expected/image-with-multiple-constraint-violations.txt
index b687556789..a7710924f6 100644
--- a/Tests/LibWeb/Layout/expected/image-with-multiple-constraint-violations.txt
+++ b/Tests/LibWeb/Layout/expected/image-with-multiple-constraint-violations.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         frag 0 from ImageBox start: 0, length: 0, rect: [11,11 80x60]
       ImageBox <img> at (11,11) content-size 80x60 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x82]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x64]
       ImagePaintable (ImageBox<IMG>) [10,10 82x62]
diff --git a/Tests/LibWeb/Layout/expected/img-with-box-sizing-border-box-and-padding.txt b/Tests/LibWeb/Layout/expected/img-with-box-sizing-border-box-and-padding.txt
index b96fc2b7ce..6d2d683f4a 100644
--- a/Tests/LibWeb/Layout/expected/img-with-box-sizing-border-box-and-padding.txt
+++ b/Tests/LibWeb/Layout/expected/img-with-box-sizing-border-box-and-padding.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       ImageBox <img.with-width> at (129,29) content-size 58x58 children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       ImagePaintable (ImageBox<IMG>.with-height) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-indefinite-containing-block-width.txt b/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-indefinite-containing-block-width.txt
index a7d6e1f26d..855cdbba29 100644
--- a/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-indefinite-containing-block-width.txt
+++ b/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-indefinite-containing-block-width.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           frag 0 from ImageBox start: 0, length: 0, rect: [8,8 120x120]
         ImageBox <img> at (8,8) content-size 120x120 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x136]
     PaintableWithLines (BlockContainer<BODY>) [8,8 120x120]
       PaintableWithLines (BlockContainer<DIV>) [8,8 120x120]
diff --git a/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-min-content-containing-block-width.txt b/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-min-content-containing-block-width.txt
index 0fd58ef25c..0add9cc920 100644
--- a/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-min-content-containing-block-width.txt
+++ b/Tests/LibWeb/Layout/expected/img-with-percentage-max-width-and-min-content-containing-block-width.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         frag 0 from ImageBox start: 0, length: 0, rect: [8,21 0x0]
       ImageBox <img> at (8,21) content-size 0x0 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x17.46875]
       ImagePaintable (ImageBox<IMG>) [8,21 0x0]
diff --git a/Tests/LibWeb/Layout/expected/inline-size.txt b/Tests/LibWeb/Layout/expected/inline-size.txt
index a48fc9da58..48a1887b6c 100644
--- a/Tests/LibWeb/Layout/expected/inline-size.txt
+++ b/Tests/LibWeb/Layout/expected/inline-size.txt
@@ -19,7 +19,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,632.84375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x632.84375]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x632.84375]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x570.84375] overflow: [0,0 800x632.84375]
     PaintableWithLines (BlockContainer<BODY>) [8,70 784x492.84375] overflow: [8,70 784x562.84375]
       PaintableWithLines (BlockContainer<P>.min-inline-test) [8,70 784x200]
diff --git a/Tests/LibWeb/Layout/expected/input-element-with-display-inline.txt b/Tests/LibWeb/Layout/expected/input-element-with-display-inline.txt
index 5f376012e1..d07e641f41 100644
--- a/Tests/LibWeb/Layout/expected/input-element-with-display-inline.txt
+++ b/Tests/LibWeb/Layout/expected/input-element-with-display-inline.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <div> at (14,13) content-size 0x21.84375 flex-item [BFC] children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x47.84375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x29.84375]
       PaintableWithLines (BlockContainer<INPUT>) [10,10 202x27.84375]
diff --git a/Tests/LibWeb/Layout/expected/input-text-node-invalidation-on-value-change.txt b/Tests/LibWeb/Layout/expected/input-text-node-invalidation-on-value-change.txt
index 481a3e2bfa..a3a2e8c31f 100644
--- a/Tests/LibWeb/Layout/expected/input-text-node-invalidation-on-value-change.txt
+++ b/Tests/LibWeb/Layout/expected/input-text-node-invalidation-on-value-change.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
       PaintableWithLines (BlockContainer<INPUT>#foo) [8,8 120x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/inset-shorthand-property.txt b/Tests/LibWeb/Layout/expected/inset-shorthand-property.txt
index e35ea9754b..dc508858fb 100644
--- a/Tests/LibWeb/Layout/expected/inset-shorthand-property.txt
+++ b/Tests/LibWeb/Layout/expected/inset-shorthand-property.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,208) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x216]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableWithLines (BlockContainer<DIV>.parent) [8,8 200x200]
diff --git a/Tests/LibWeb/Layout/expected/lh-1.txt b/Tests/LibWeb/Layout/expected/lh-1.txt
index a0bbd0d09c..4ffe4ff354 100644
--- a/Tests/LibWeb/Layout/expected/lh-1.txt
+++ b/Tests/LibWeb/Layout/expected/lh-1.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div#b> at (8,8) content-size 100x100 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableWithLines (BlockContainer<DIV>#a) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/lh-2.txt b/Tests/LibWeb/Layout/expected/lh-2.txt
index a0bbd0d09c..4ffe4ff354 100644
--- a/Tests/LibWeb/Layout/expected/lh-2.txt
+++ b/Tests/LibWeb/Layout/expected/lh-2.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div#b> at (8,8) content-size 100x100 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableWithLines (BlockContainer<DIV>#a) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/line-height-calc-number.txt b/Tests/LibWeb/Layout/expected/line-height-calc-number.txt
index 69113df06c..a049307356 100644
--- a/Tests/LibWeb/Layout/expected/line-height-calc-number.txt
+++ b/Tests/LibWeb/Layout/expected/line-height-calc-number.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "hello friends"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x80]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x64]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x64]
diff --git a/Tests/LibWeb/Layout/expected/link-sheet.txt b/Tests/LibWeb/Layout/expected/link-sheet.txt
index 50e2ec2236..a8d816d5d1 100644
--- a/Tests/LibWeb/Layout/expected/link-sheet.txt
+++ b/Tests/LibWeb/Layout/expected/link-sheet.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x0 children: not-inline
       BlockContainer <div#foo> at (0,0) content-size 123x456 positioned [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16] overflow: [0,0 800x456]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [0,0 123x456]
       PaintableWithLines (BlockContainer<DIV>#foo) [0,0 123x456]
diff --git a/Tests/LibWeb/Layout/expected/misc/grid-template-block-components-whitespace-crash.txt b/Tests/LibWeb/Layout/expected/misc/grid-template-block-components-whitespace-crash.txt
index 8421ce447e..f5204a0f46 100644
--- a/Tests/LibWeb/Layout/expected/misc/grid-template-block-components-whitespace-crash.txt
+++ b/Tests/LibWeb/Layout/expected/misc/grid-template-block-components-whitespace-crash.txt
@@ -2,6 +2,6 @@ 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 784x0 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/misc/percentage-stroke-width-crash.txt b/Tests/LibWeb/Layout/expected/misc/percentage-stroke-width-crash.txt
index 17ae182190..ac8ed6ccee 100644
--- a/Tests/LibWeb/Layout/expected/misc/percentage-stroke-width-crash.txt
+++ b/Tests/LibWeb/Layout/expected/misc/percentage-stroke-width-crash.txt
@@ -2,6 +2,6 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
   BlockContainer <html> at (0,0) content-size 800x16 [BFC] children: not-inline
     BlockContainer <body> at (8,8) content-size 784x0 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/misc/scroll.txt b/Tests/LibWeb/Layout/expected/misc/scroll.txt
index 4979800d33..f292fed0b6 100644
--- a/Tests/LibWeb/Layout/expected/misc/scroll.txt
+++ b/Tests/LibWeb/Layout/expected/misc/scroll.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div#scrollbox> at (9,9) content-size 200x200 [BFC] children: not-inline
         BlockContainer <div#content> at (9,9) content-size 200x1000 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x202]
       PaintableWithLines (BlockContainer<DIV>#scrollbox) [8,8 202x202] overflow: [9,9 200x1000] scroll-offset: [0,100]
diff --git a/Tests/LibWeb/Layout/expected/negative-max-size.txt b/Tests/LibWeb/Layout/expected/negative-max-size.txt
index 2ed4fd0aa6..0717bd8fa3 100644
--- a/Tests/LibWeb/Layout/expected/negative-max-size.txt
+++ b/Tests/LibWeb/Layout/expected/negative-max-size.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "Well, hello friends!"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x35.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x19.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 784x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/non-floating-non-replaced-element-percentage-padding-against-indefinite-width.txt b/Tests/LibWeb/Layout/expected/non-floating-non-replaced-element-percentage-padding-against-indefinite-width.txt
index 27def9d95a..5121529648 100644
--- a/Tests/LibWeb/Layout/expected/non-floating-non-replaced-element-percentage-padding-against-indefinite-width.txt
+++ b/Tests/LibWeb/Layout/expected/non-floating-non-replaced-element-percentage-padding-against-indefinite-width.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div> at (8,8) content-size 0x0 flex-item [BFC] children: not-inline
           Box <div#box2> at (8,8) content-size 0x0 flex-container(row) [FFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableBox (Box<DIV>#box1) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/overflow-x-hidden-with-border-radius.txt b/Tests/LibWeb/Layout/expected/overflow-x-hidden-with-border-radius.txt
index 806932dcaf..5e23d1cf01 100644
--- a/Tests/LibWeb/Layout/expected/overflow-x-hidden-with-border-radius.txt
+++ b/Tests/LibWeb/Layout/expected/overflow-x-hidden-with-border-radius.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,110) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x102]
       PaintableWithLines (BlockContainer<DIV>.box) [8,8 102x102]
diff --git a/Tests/LibWeb/Layout/expected/percentage-max-height-when-containing-block-has-indefinite-height.txt b/Tests/LibWeb/Layout/expected/percentage-max-height-when-containing-block-has-indefinite-height.txt
index d06461cdbd..26005b46b3 100644
--- a/Tests/LibWeb/Layout/expected/percentage-max-height-when-containing-block-has-indefinite-height.txt
+++ b/Tests/LibWeb/Layout/expected/percentage-max-height-when-containing-block-has-indefinite-height.txt
@@ -45,7 +45,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,115.34375) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x125.34375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x107.34375]
       PaintableWithLines (BlockContainer<DIV>.block.formatting-context) [10,10 780x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/picture-source-media-query.txt b/Tests/LibWeb/Layout/expected/picture-source-media-query.txt
index 32685bd443..adfbf1db2a 100644
--- a/Tests/LibWeb/Layout/expected/picture-source-media-query.txt
+++ b/Tests/LibWeb/Layout/expected/picture-source-media-query.txt
@@ -12,7 +12,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x416]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x400]
       InlinePaintable (InlineNode<PICTURE>)
diff --git a/Tests/LibWeb/Layout/expected/place-content-shorthand-property.txt b/Tests/LibWeb/Layout/expected/place-content-shorthand-property.txt
index 99de87bf25..bc80dc9ac1 100644
--- a/Tests/LibWeb/Layout/expected/place-content-shorthand-property.txt
+++ b/Tests/LibWeb/Layout/expected/place-content-shorthand-property.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "Text"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 812x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 812x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x39.46875] overflow: [1,1 811x37.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x21.46875] overflow: [10,10 802x19.46875]
       PaintableBox (Box<DIV>.container) [10,10 802x19.46875]
diff --git a/Tests/LibWeb/Layout/expected/position-absolute-from-edges.txt b/Tests/LibWeb/Layout/expected/position-absolute-from-edges.txt
index 0c6f18b449..4cfcc397c9 100644
--- a/Tests/LibWeb/Layout/expected/position-absolute-from-edges.txt
+++ b/Tests/LibWeb/Layout/expected/position-absolute-from-edges.txt
@@ -13,7 +13,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (BlockContainer<DIV>#container) [8,8 540x440]
diff --git a/Tests/LibWeb/Layout/expected/position-absolute-ignores-padding-of-position-relative-floating-parent.txt b/Tests/LibWeb/Layout/expected/position-absolute-ignores-padding-of-position-relative-floating-parent.txt
index da90caee0f..d574aaf4dd 100644
--- a/Tests/LibWeb/Layout/expected/position-absolute-ignores-padding-of-position-relative-floating-parent.txt
+++ b/Tests/LibWeb/Layout/expected/position-absolute-ignores-padding-of-position-relative-floating-parent.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <div#container> at (18,18) content-size 0x0 positioned floating [BFC] children: not-inline
           BlockContainer <div#box> at (8,8) content-size 100x100 positioned [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x216]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x200]
       PaintableWithLines (BlockContainer<DIV>#guide) [8,8 200x200]
diff --git a/Tests/LibWeb/Layout/expected/position-absolute-top-left.txt b/Tests/LibWeb/Layout/expected/position-absolute-top-left.txt
index 9bf33d3e5e..531018b468 100644
--- a/Tests/LibWeb/Layout/expected/position-absolute-top-left.txt
+++ b/Tests/LibWeb/Layout/expected/position-absolute-top-left.txt
@@ -35,7 +35,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,608) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x616]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x616]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x600]
diff --git a/Tests/LibWeb/Layout/expected/position-empty-pseudo-elements.txt b/Tests/LibWeb/Layout/expected/position-empty-pseudo-elements.txt
index bd1c12441e..15c37dbf98 100644
--- a/Tests/LibWeb/Layout/expected/position-empty-pseudo-elements.txt
+++ b/Tests/LibWeb/Layout/expected/position-empty-pseudo-elements.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,175) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x158] overflow: [0,0 800x175]
     PaintableWithLines (BlockContainer<BODY>) [8,25 784x125] overflow: [8,25 784x150]
       PaintableWithLines (BlockContainer<DIV>.empty_content) [33,25 50x50]
diff --git a/Tests/LibWeb/Layout/expected/pre.txt b/Tests/LibWeb/Layout/expected/pre.txt
index c65b03d40c..aa18d34b73 100644
--- a/Tests/LibWeb/Layout/expected/pre.txt
+++ b/Tests/LibWeb/Layout/expected/pre.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       InlinePaintable (InlineNode<PRE>)
diff --git a/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties-2.txt b/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties-2.txt
index fcf5152472..dd32b7e23b 100644
--- a/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties-2.txt
+++ b/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties-2.txt
@@ -50,7 +50,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,462.28125) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x470.28125]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x454.28125]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x21.84375]
diff --git a/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties.txt b/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties.txt
index 831a7cc6e2..3bb6381629 100644
--- a/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties.txt
+++ b/Tests/LibWeb/Layout/expected/pseudo-element-with-custom-properties.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> at (8,8) content-size 500x100 positioned [BFC] children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16] overflow: [0,0 800x108]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 784x100]
       PaintableWithLines (BlockContainer<DIV>.hello) [8,8 784x0] overflow: [8,8 500x100]
diff --git a/Tests/LibWeb/Layout/expected/replaced-box-with-vertical-margins.txt b/Tests/LibWeb/Layout/expected/replaced-box-with-vertical-margins.txt
index cd5d3b9c23..e25b23af90 100644
--- a/Tests/LibWeb/Layout/expected/replaced-box-with-vertical-margins.txt
+++ b/Tests/LibWeb/Layout/expected/replaced-box-with-vertical-margins.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       ImageBox <img#image> at (51,33) content-size 64x138 children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x216.46875]
       TextPaintable (TextNode<#text>)
diff --git a/Tests/LibWeb/Layout/expected/resolve-cyclic-percentage-against-zero-when-available-size-is-min-content.txt b/Tests/LibWeb/Layout/expected/resolve-cyclic-percentage-against-zero-when-available-size-is-min-content.txt
index b33d0c37a1..4abc5327ef 100644
--- a/Tests/LibWeb/Layout/expected/resolve-cyclic-percentage-against-zero-when-available-size-is-min-content.txt
+++ b/Tests/LibWeb/Layout/expected/resolve-cyclic-percentage-against-zero-when-available-size-is-min-content.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,1243.46875) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x1253.46875]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x1253.46875]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x1253.46875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x1235.46875]
       PaintableWithLines (BlockContainer<DIV>.w.min) [10,10 4x19.46875] overflow: [11,11 3x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/resolve-height-of-containing-block.txt b/Tests/LibWeb/Layout/expected/resolve-height-of-containing-block.txt
index 268867ea6b..a83b608236 100644
--- a/Tests/LibWeb/Layout/expected/resolve-height-of-containing-block.txt
+++ b/Tests/LibWeb/Layout/expected/resolve-height-of-containing-block.txt
@@ -25,7 +25,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,816) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 1288x824]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 1288x824]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x824] overflow: [0,0 1288x824]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,16 784x800] overflow: [8,16 1280x800]
diff --git a/Tests/LibWeb/Layout/expected/set-margin-of-floating-box.txt b/Tests/LibWeb/Layout/expected/set-margin-of-floating-box.txt
index ca7c71966f..7fb135428b 100644
--- a/Tests/LibWeb/Layout/expected/set-margin-of-floating-box.txt
+++ b/Tests/LibWeb/Layout/expected/set-margin-of-floating-box.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,49.46875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,16 784x17.46875] overflow: [8,16 784x33.46875]
diff --git a/Tests/LibWeb/Layout/expected/svg-preserve-aspect-ratio.txt b/Tests/LibWeb/Layout/expected/svg-preserve-aspect-ratio.txt
index 7bd909ba5c..0b4873403c 100644
--- a/Tests/LibWeb/Layout/expected/svg-preserve-aspect-ratio.txt
+++ b/Tests/LibWeb/Layout/expected/svg-preserve-aspect-ratio.txt
@@ -104,7 +104,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x257.46875]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,83 102x52]
diff --git a/Tests/LibWeb/Layout/expected/svg-transforms-and-viewboxes.txt b/Tests/LibWeb/Layout/expected/svg-transforms-and-viewboxes.txt
index a50cfcb82c..2f9f52f931 100644
--- a/Tests/LibWeb/Layout/expected/svg-transforms-and-viewboxes.txt
+++ b/Tests/LibWeb/Layout/expected/svg-transforms-and-viewboxes.txt
@@ -95,7 +95,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x700]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x700]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x700]
     PaintableWithLines (BlockContainer<BODY>) [50,50 700x600]
       SVGSVGPaintable (SVGSVGBox<svg>) [50,150 200x100]
diff --git a/Tests/LibWeb/Layout/expected/svg/dont-stretch-fit-svg-with-indefinite-containing-block-width.txt b/Tests/LibWeb/Layout/expected/svg/dont-stretch-fit-svg-with-indefinite-containing-block-width.txt
index d463b1a833..1523abe654 100644
--- a/Tests/LibWeb/Layout/expected/svg/dont-stretch-fit-svg-with-indefinite-containing-block-width.txt
+++ b/Tests/LibWeb/Layout/expected/svg/dont-stretch-fit-svg-with-indefinite-containing-block-width.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         frag 0 from SVGSVGBox start: 0, length: 0, rect: [8,21 0x0]
       SVGSVGBox <svg> at (8,21) content-size 0x0 [SVG] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 0x17.46875]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,21 0x0]
diff --git a/Tests/LibWeb/Layout/expected/svg/mask-element-should-not-participate-in-layout.txt b/Tests/LibWeb/Layout/expected/svg/mask-element-should-not-participate-in-layout.txt
index ad8b4a1dce..66e291a5a7 100644
--- a/Tests/LibWeb/Layout/expected/svg/mask-element-should-not-participate-in-layout.txt
+++ b/Tests/LibWeb/Layout/expected/svg/mask-element-should-not-participate-in-layout.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-as-image-implicit-viewbox.txt b/Tests/LibWeb/Layout/expected/svg/svg-as-image-implicit-viewbox.txt
index 8a908461eb..3cdc305fea 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-as-image-implicit-viewbox.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-as-image-implicit-viewbox.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           SVGSVGBox <svg> at (0,0) content-size 50x100 [SVG] children: not-inline
             SVGGeometryBox <rect> at (0,0) content-size 50x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       ImagePaintable (ImageBox<IMG>) [8,8 50x100]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-as-image-invalid.txt b/Tests/LibWeb/Layout/expected/svg/svg-as-image-invalid.txt
index cba09e9852..ec52dc6183 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-as-image-invalid.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-as-image-invalid.txt
@@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
     BlockContainer <body> at (8,8) content-size 784x32 children: not-inline
       ImageBox <img> at (8,8) content-size 16x32 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x48]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x32]
       ImagePaintable (ImageBox<IMG>) [8,8 16x32]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-as-image.txt b/Tests/LibWeb/Layout/expected/svg/svg-as-image.txt
index db01ba34d3..7c369a98d6 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-as-image.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-as-image.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             SVGGeometryBox <rect> at (0,0) content-size 784x1568 children: not-inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x1584]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x1584]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x1584]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x1568]
       ImagePaintable (ImageBox<IMG>) [8,8 784x1568]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-different-types-of-opacity.txt b/Tests/LibWeb/Layout/expected/svg/svg-different-types-of-opacity.txt
index 83c274c7f9..0ba639e3b6 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-different-types-of-opacity.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-different-types-of-opacity.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x800]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x784]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 784x784]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-fill-with-bogus-url.txt b/Tests/LibWeb/Layout/expected/svg/svg-fill-with-bogus-url.txt
index 6f6f284e45..f801ae6981 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-fill-with-bogus-url.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-fill-with-bogus-url.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (8,8) content-size 784x784 [SVG] children: not-inline
         SVGGeometryBox <rect> at (8,8) content-size 784x784 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x800]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x784]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 784x784]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-g-with-opacity.txt b/Tests/LibWeb/Layout/expected/svg/svg-g-with-opacity.txt
index 2e207af007..974cbb61f9 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-g-with-opacity.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-g-with-opacity.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x800]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x784]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 784x784]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-inside-svg.txt b/Tests/LibWeb/Layout/expected/svg/svg-inside-svg.txt
index 6ccdd7f08f..3e8185fabb 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-inside-svg.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-inside-svg.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             SVGGeometryBox <rect> at (8,8) content-size 24x24 children: not-inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x40]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x24]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 24x24]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-intrinsic-size-in-one-dimension.txt b/Tests/LibWeb/Layout/expected/svg/svg-intrinsic-size-in-one-dimension.txt
index b1deb64aa2..01efac30da 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-intrinsic-size-in-one-dimension.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-intrinsic-size-in-one-dimension.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (9,61) content-size 200x100 [SVG] children: not-inline
         SVGGeometryBox <rect> at (34,86) content-size 150x50 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x170]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x154]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 102x52]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-negative-elliptical-arg-number.txt b/Tests/LibWeb/Layout/expected/svg/svg-negative-elliptical-arg-number.txt
index 0da70a8b06..a25f3b9ef4 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-negative-elliptical-arg-number.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-negative-elliptical-arg-number.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (8,8) content-size 100x100 [SVG] children: not-inline
         SVGGeometryBox <path> at (8,10) content-size 100x48 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-path-with-implicit-lineto.txt b/Tests/LibWeb/Layout/expected/svg/svg-path-with-implicit-lineto.txt
index a33aeb208d..38970279e7 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-path-with-implicit-lineto.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-path-with-implicit-lineto.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (8,8) content-size 100x100 [SVG] children: not-inline
         SVGGeometryBox <path> at (28,28) content-size 60x60 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x116]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 100x100]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-symbol-with-viewbox.txt b/Tests/LibWeb/Layout/expected/svg/svg-symbol-with-viewbox.txt
index f25a799ea5..47d12d6f20 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-symbol-with-viewbox.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-symbol-with-viewbox.txt
@@ -19,7 +19,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           TextNode <#text>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x150]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x0]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-with-css-variable-in-presentation-hint.txt b/Tests/LibWeb/Layout/expected/svg/svg-with-css-variable-in-presentation-hint.txt
index d5ded2f44f..96c3571daa 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-with-css-variable-in-presentation-hint.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-with-css-variable-in-presentation-hint.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (9,9) content-size 100x100 [SVG] children: not-inline
         SVGGeometryBox <rect> at (29,29) content-size 60x60 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x118]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x102]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 102x102]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-with-display-block.txt b/Tests/LibWeb/Layout/expected/svg/svg-with-display-block.txt
index 04c817a135..24143cec5c 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-with-display-block.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-with-display-block.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (8,8) content-size 784x784 [SVG] children: not-inline
         SVGGeometryBox <rect> at (8,8) content-size 784x784 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x800]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x800]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x784]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 784x784]
diff --git a/Tests/LibWeb/Layout/expected/svg/svg-with-zero-intrinsic-size-and-no-viewbox.txt b/Tests/LibWeb/Layout/expected/svg/svg-with-zero-intrinsic-size-and-no-viewbox.txt
index e69ed3660b..c748c3af19 100644
--- a/Tests/LibWeb/Layout/expected/svg/svg-with-zero-intrinsic-size-and-no-viewbox.txt
+++ b/Tests/LibWeb/Layout/expected/svg/svg-with-zero-intrinsic-size-and-no-viewbox.txt
@@ -20,7 +20,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         TextNode <#text>
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       ImagePaintable (ImageBox<IMG>) [8,21 0x0]
diff --git a/Tests/LibWeb/Layout/expected/svg/text-fill-none.txt b/Tests/LibWeb/Layout/expected/svg/text-fill-none.txt
index 38d923760f..7de6846f7d 100644
--- a/Tests/LibWeb/Layout/expected/svg/text-fill-none.txt
+++ b/Tests/LibWeb/Layout/expected/svg/text-fill-none.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         SVGTextBox <text> at (8,8) content-size 0x0 children: not-inline
       TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x150]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 300x150]
diff --git a/Tests/LibWeb/Layout/expected/table/align-top-and-bottom.txt b/Tests/LibWeb/Layout/expected/table/align-top-and-bottom.txt
index b8f0db1b9c..1d1b5d1b94 100644
--- a/Tests/LibWeb/Layout/expected/table/align-top-and-bottom.txt
+++ b/Tests/LibWeb/Layout/expected/table/align-top-and-bottom.txt
@@ -45,7 +45,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 200.328125x100.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/auto-height.txt b/Tests/LibWeb/Layout/expected/table/auto-height.txt
index 681f3ffe0e..43eb8f385e 100644
--- a/Tests/LibWeb/Layout/expected/table/auto-height.txt
+++ b/Tests/LibWeb/Layout/expected/table/auto-height.txt
@@ -22,7 +22,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (10,52.9375) content-size 780x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x62.9375]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x44.9375]
       PaintableWithLines (BlockContainer<DIV>) [10,10 780x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/auto-margins.txt b/Tests/LibWeb/Layout/expected/table/auto-margins.txt
index b6d130bcaf..d4a7862ddb 100644
--- a/Tests/LibWeb/Layout/expected/table/auto-margins.txt
+++ b/Tests/LibWeb/Layout/expected/table/auto-margins.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "DaTa DisplaYiNg CSS WeBpaGE ScReEn"
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<DIV>.wrapper) [8,8 784x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/avoid-div-by-zero-in-table-measures.txt b/Tests/LibWeb/Layout/expected/table/avoid-div-by-zero-in-table-measures.txt
index cb388333fb..236fafb925 100644
--- a/Tests/LibWeb/Layout/expected/table/avoid-div-by-zero-in-table-measures.txt
+++ b/Tests/LibWeb/Layout/expected/table/avoid-div-by-zero-in-table-measures.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x23.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 6x23.46875] overflow: [8,8 17.265625x23.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/basic.txt b/Tests/LibWeb/Layout/expected/table/basic.txt
index d99cdcaa3c..21f1045c5d 100644
--- a/Tests/LibWeb/Layout/expected/table/basic.txt
+++ b/Tests/LibWeb/Layout/expected/table/basic.txt
@@ -71,7 +71,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,93.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x85.875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 2x2]
diff --git a/Tests/LibWeb/Layout/expected/table/border-collapse-is-inherited.txt b/Tests/LibWeb/Layout/expected/table/border-collapse-is-inherited.txt
index efe3fce3d3..7595319537 100644
--- a/Tests/LibWeb/Layout/expected/table/border-collapse-is-inherited.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-collapse-is-inherited.txt
@@ -153,7 +153,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,207.34375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x215.34375]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x199.34375]
diff --git a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-cell.txt b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-cell.txt
index fc1c53fa76..1baa15529a 100644
--- a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-cell.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-cell.txt
@@ -63,7 +63,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x86.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 172.671875x86.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-col.txt b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-col.txt
index 63830a79c9..db181b2b71 100644
--- a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-col.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-col.txt
@@ -69,7 +69,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,169.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x177.875]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x161.875]
diff --git a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-row.txt b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-row.txt
index 81169ed6c3..4242260eb6 100644
--- a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-row.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-row.txt
@@ -68,7 +68,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x130.40625]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 114.8125x130.40625]
diff --git a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-rowgroup.txt b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-rowgroup.txt
index a07e3e9443..f56a9dbfae 100644
--- a/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-rowgroup.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-conflict-resolution-with-rowgroup.txt
@@ -69,7 +69,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x124.40625]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 113.40625x124.40625]
diff --git a/Tests/LibWeb/Layout/expected/table/border-spacing-and-borders-table-width.txt b/Tests/LibWeb/Layout/expected/table/border-spacing-and-borders-table-width.txt
index 2d18e6eea7..cbe7d9a5bf 100644
--- a/Tests/LibWeb/Layout/expected/table/border-spacing-and-borders-table-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-spacing-and-borders-table-width.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x77.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 143.609375x77.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/border-spacing-colspan.txt b/Tests/LibWeb/Layout/expected/table/border-spacing-colspan.txt
index f6eed18be4..ad5535a4a7 100644
--- a/Tests/LibWeb/Layout/expected/table/border-spacing-colspan.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-spacing-colspan.txt
@@ -140,7 +140,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,267.34375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x275.34375]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x259.34375]
diff --git a/Tests/LibWeb/Layout/expected/table/border-spacing-rowspan.txt b/Tests/LibWeb/Layout/expected/table/border-spacing-rowspan.txt
index aac9965fe4..61265b4e1c 100644
--- a/Tests/LibWeb/Layout/expected/table/border-spacing-rowspan.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-spacing-rowspan.txt
@@ -140,7 +140,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,267.34375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x275.34375]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x259.34375]
diff --git a/Tests/LibWeb/Layout/expected/table/border-spacing-with-percentage-width.txt b/Tests/LibWeb/Layout/expected/table/border-spacing-with-percentage-width.txt
index d162537af2..14ee92197d 100644
--- a/Tests/LibWeb/Layout/expected/table/border-spacing-with-percentage-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-spacing-with-percentage-width.txt
@@ -35,7 +35,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "C"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (BlockContainer<DIV>.left) [8,8 117.59375x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/border-spacing.txt b/Tests/LibWeb/Layout/expected/table/border-spacing.txt
index 708673f8f4..498c72eda8 100644
--- a/Tests/LibWeb/Layout/expected/table/border-spacing.txt
+++ b/Tests/LibWeb/Layout/expected/table/border-spacing.txt
@@ -147,7 +147,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,267.34375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x275.34375]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x259.34375]
diff --git a/Tests/LibWeb/Layout/expected/table/borders.txt b/Tests/LibWeb/Layout/expected/table/borders.txt
index ace129e707..72e561cd30 100644
--- a/Tests/LibWeb/Layout/expected/table/borders.txt
+++ b/Tests/LibWeb/Layout/expected/table/borders.txt
@@ -259,7 +259,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,273.625) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x265.625]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 174.296875x74.40625]
diff --git a/Tests/LibWeb/Layout/expected/table/bottom-caption.txt b/Tests/LibWeb/Layout/expected/table/bottom-caption.txt
index 0e3f5b3569..015fb6fd0e 100644
--- a/Tests/LibWeb/Layout/expected/table/bottom-caption.txt
+++ b/Tests/LibWeb/Layout/expected/table/bottom-caption.txt
@@ -68,7 +68,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,91.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x99.875]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x83.875]
diff --git a/Tests/LibWeb/Layout/expected/table/cell-auto-max-width-table-percentage-width.txt b/Tests/LibWeb/Layout/expected/table/cell-auto-max-width-table-percentage-width.txt
index 5743c0dac6..debe7305bd 100644
--- a/Tests/LibWeb/Layout/expected/table/cell-auto-max-width-table-percentage-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/cell-auto-max-width-table-percentage-width.txt
@@ -42,7 +42,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BlockContainer <(anonymous)> at (8,31.46875) content-size 80x0 children: inline
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x23.46875]
       PaintableWithLines (BlockContainer<DIV>#container) [8,8 80x23.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/cell-px-height.txt b/Tests/LibWeb/Layout/expected/table/cell-px-height.txt
index a41af4074d..bca747dc57 100644
--- a/Tests/LibWeb/Layout/expected/table/cell-px-height.txt
+++ b/Tests/LibWeb/Layout/expected/table/cell-px-height.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         Box <div.row> at (8,8) content-size 102x100 table-row children: not-inline
           BlockContainer <div.cell> at (9,9) content-size 100x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (TableWrapper(anonymous)) [8,8 102x100]
       PaintableBox (Box<BODY>) [8,8 102x100]
diff --git a/Tests/LibWeb/Layout/expected/table/cell-relative-to-specified-table-width.txt b/Tests/LibWeb/Layout/expected/table/cell-relative-to-specified-table-width.txt
index 5656d08495..0fd0d3b07d 100644
--- a/Tests/LibWeb/Layout/expected/table/cell-relative-to-specified-table-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/cell-relative-to-specified-table-width.txt
@@ -63,7 +63,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 784x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/clip-spans-to-table-end.txt b/Tests/LibWeb/Layout/expected/table/clip-spans-to-table-end.txt
index ddf4b85cd0..0a268b655d 100644
--- a/Tests/LibWeb/Layout/expected/table/clip-spans-to-table-end.txt
+++ b/Tests/LibWeb/Layout/expected/table/clip-spans-to-table-end.txt
@@ -64,7 +64,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x118.40625]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 92.359375x118.40625]
diff --git a/Tests/LibWeb/Layout/expected/table/colspan-percentage-width.txt b/Tests/LibWeb/Layout/expected/table/colspan-percentage-width.txt
index 59859d3493..c11cc66ac0 100644
--- a/Tests/LibWeb/Layout/expected/table/colspan-percentage-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/colspan-percentage-width.txt
@@ -52,7 +52,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 420x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/colspan-weighted-width-distribution.txt b/Tests/LibWeb/Layout/expected/table/colspan-weighted-width-distribution.txt
index 1223039fa4..decec7dde3 100644
--- a/Tests/LibWeb/Layout/expected/table/colspan-weighted-width-distribution.txt
+++ b/Tests/LibWeb/Layout/expected/table/colspan-weighted-width-distribution.txt
@@ -38,7 +38,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 210x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/colspan-width-distribution.txt b/Tests/LibWeb/Layout/expected/table/colspan-width-distribution.txt
index 527da5957c..5e8d6e6ded 100644
--- a/Tests/LibWeb/Layout/expected/table/colspan-width-distribution.txt
+++ b/Tests/LibWeb/Layout/expected/table/colspan-width-distribution.txt
@@ -44,7 +44,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,52.9375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x60.9375]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt b/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt
index 623a767c39..41cbb637fd 100644
--- a/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt
+++ b/Tests/LibWeb/Layout/expected/table/columns-width-distribution-1.txt
@@ -30,7 +30,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "client."
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x113.15625]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 784x113.15625]
diff --git a/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width-all-columns.txt b/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width-all-columns.txt
index a74f5f4cc8..c0320ed699 100644
--- a/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width-all-columns.txt
+++ b/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width-all-columns.txt
@@ -73,7 +73,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 600x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width.txt b/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width.txt
index 49c3e1ec63..dcecb0c4f4 100644
--- a/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/fixed-layout-percentage-width.txt
@@ -73,7 +73,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 600x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width-all-columns.txt b/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width-all-columns.txt
index f29993a60d..9da097bfdd 100644
--- a/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width-all-columns.txt
+++ b/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width-all-columns.txt
@@ -73,7 +73,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 600x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width.txt b/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width.txt
index 6867e962f6..2ef3e76444 100644
--- a/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/fixed-layout-pixel-width.txt
@@ -79,7 +79,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x80.8125]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 600x80.8125]
diff --git a/Tests/LibWeb/Layout/expected/table/fixed-layout.txt b/Tests/LibWeb/Layout/expected/table/fixed-layout.txt
index 30375dfdb6..fc72050bae 100644
--- a/Tests/LibWeb/Layout/expected/table/fixed-layout.txt
+++ b/Tests/LibWeb/Layout/expected/table/fixed-layout.txt
@@ -73,7 +73,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x44.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 600x44.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/fixed-margins.txt b/Tests/LibWeb/Layout/expected/table/fixed-margins.txt
index f51ba5600f..644297f5f8 100644
--- a/Tests/LibWeb/Layout/expected/table/fixed-margins.txt
+++ b/Tests/LibWeb/Layout/expected/table/fixed-margins.txt
@@ -14,7 +14,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "To AdJuSt PRiCiNG sTYLiNG ceLL oF TAbLeS"
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x35.40625]
       PaintableWithLines (BlockContainer<DIV>.wrapper) [8,8 784x35.40625]
diff --git a/Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt b/Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt
index 9d21ffbb9b..1c3eb9863f 100644
--- a/Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt
+++ b/Tests/LibWeb/Layout/expected/table/in-auto-height-flex-item.txt
@@ -11,7 +11,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                     "Hello"
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x41.46875]
     PaintableBox (Box<BODY>) [9,9 782x23.46875]
       PaintableWithLines (BlockContainer<DIV>.upper) [10,10 43.78125x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/infinite-padding.txt b/Tests/LibWeb/Layout/expected/table/infinite-padding.txt
index cbac3178ab..0c6c232526 100644
--- a/Tests/LibWeb/Layout/expected/table/infinite-padding.txt
+++ b/Tests/LibWeb/Layout/expected/table/infinite-padding.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                 TableWrapper <(anonymous)> at (8,8) content-size 0x0 [BFC] children: not-inline
                   Box <div#box2> at (8,8) content-size 0x0 table-box [TFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x16]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 0x0]
diff --git a/Tests/LibWeb/Layout/expected/table/inline-table-width.txt b/Tests/LibWeb/Layout/expected/table/inline-table-width.txt
index 355b7e40c1..5598c011ea 100644
--- a/Tests/LibWeb/Layout/expected/table/inline-table-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/inline-table-width.txt
@@ -30,7 +30,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                       "false"
                   TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x46.9375]
       PaintableWithLines (BlockContainer<TABLE>) [8,8 137.984375x46.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/long-caption-increases-width.txt b/Tests/LibWeb/Layout/expected/table/long-caption-increases-width.txt
index 3d96e7252f..0ea2bf66fd 100644
--- a/Tests/LibWeb/Layout/expected/table/long-caption-increases-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/long-caption-increases-width.txt
@@ -92,7 +92,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,119.8125) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x127.8125]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x111.8125]
diff --git a/Tests/LibWeb/Layout/expected/table/multi-line-cell.txt b/Tests/LibWeb/Layout/expected/table/multi-line-cell.txt
index 40a86571e1..dcb2df74d6 100644
--- a/Tests/LibWeb/Layout/expected/table/multi-line-cell.txt
+++ b/Tests/LibWeb/Layout/expected/table/multi-line-cell.txt
@@ -28,7 +28,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,76.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x68.875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 81.4375x68.875]
diff --git a/Tests/LibWeb/Layout/expected/table/nested-table-box-width.txt b/Tests/LibWeb/Layout/expected/table/nested-table-box-width.txt
index 9957320544..88575ea406 100644
--- a/Tests/LibWeb/Layout/expected/table/nested-table-box-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/nested-table-box-width.txt
@@ -81,7 +81,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,132.9375) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x140.9375]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x124.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/percentage-width-columns.txt b/Tests/LibWeb/Layout/expected/table/percentage-width-columns.txt
index 7fb8d133c5..91e734f528 100644
--- a/Tests/LibWeb/Layout/expected/table/percentage-width-columns.txt
+++ b/Tests/LibWeb/Layout/expected/table/percentage-width-columns.txt
@@ -37,7 +37,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x23.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 94x23.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/percentage-width-for-nested-table-is-like-auto.txt b/Tests/LibWeb/Layout/expected/table/percentage-width-for-nested-table-is-like-auto.txt
index a03fef0134..68461136cb 100644
--- a/Tests/LibWeb/Layout/expected/table/percentage-width-for-nested-table-is-like-auto.txt
+++ b/Tests/LibWeb/Layout/expected/table/percentage-width-for-nested-table-is-like-auto.txt
@@ -18,7 +18,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                                   "A A"
                               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x31.46875]
       PaintableBox (Box<DIV>.grid_layout) [8,8 784x31.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/percentage-width-max-width-columns.txt b/Tests/LibWeb/Layout/expected/table/percentage-width-max-width-columns.txt
index 88d209e79b..a03e99a1b4 100644
--- a/Tests/LibWeb/Layout/expected/table/percentage-width-max-width-columns.txt
+++ b/Tests/LibWeb/Layout/expected/table/percentage-width-max-width-columns.txt
@@ -33,7 +33,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 119x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/propagate-style-update-to-wrapper.txt b/Tests/LibWeb/Layout/expected/table/propagate-style-update-to-wrapper.txt
index acafec31e8..2a35ce9c31 100644
--- a/Tests/LibWeb/Layout/expected/table/propagate-style-update-to-wrapper.txt
+++ b/Tests/LibWeb/Layout/expected/table/propagate-style-update-to-wrapper.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0] overflow: [8,8 6x6]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 6x6]
diff --git a/Tests/LibWeb/Layout/expected/table/row-outer-size-with-computed-size.txt b/Tests/LibWeb/Layout/expected/table/row-outer-size-with-computed-size.txt
index 76aabab67c..c14f0a77d8 100644
--- a/Tests/LibWeb/Layout/expected/table/row-outer-size-with-computed-size.txt
+++ b/Tests/LibWeb/Layout/expected/table/row-outer-size-with-computed-size.txt
@@ -33,7 +33,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x25.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 49.21875x25.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/row-px-height.txt b/Tests/LibWeb/Layout/expected/table/row-px-height.txt
index a41af4074d..bca747dc57 100644
--- a/Tests/LibWeb/Layout/expected/table/row-px-height.txt
+++ b/Tests/LibWeb/Layout/expected/table/row-px-height.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         Box <div.row> at (8,8) content-size 102x100 table-row children: not-inline
           BlockContainer <div.cell> at (9,9) content-size 100x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (TableWrapper(anonymous)) [8,8 102x100]
       PaintableBox (Box<BODY>) [8,8 102x100]
diff --git a/Tests/LibWeb/Layout/expected/table/row-span-and-nested-tables.txt b/Tests/LibWeb/Layout/expected/table/row-span-and-nested-tables.txt
index 34fa8b6f4e..62aee5219a 100644
--- a/Tests/LibWeb/Layout/expected/table/row-span-and-nested-tables.txt
+++ b/Tests/LibWeb/Layout/expected/table/row-span-and-nested-tables.txt
@@ -93,7 +93,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,124.40625) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x132.40625]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x116.40625]
diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt
index ae065c7d11..35d9fd8ebe 100644
--- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt
+++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-1.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           Box <div.row.b> at (8,58) content-size 200x100 table-row children: not-inline
             BlockContainer <div.cell> at (8,58) content-size 200x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x150]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 200x150]
diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt
index 6e30258749..f9f8c85c01 100644
--- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt
+++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-2.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           Box <div.row.b> at (8,158) content-size 200x150 table-row children: not-inline
             BlockContainer <div.cell> at (8,158) content-size 200x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x300]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 200x300]
diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt
index ae886b72f1..fcada1d1b6 100644
--- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt
+++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-3.txt
@@ -16,7 +16,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                   "b"
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x300]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 200x300]
diff --git a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt
index 5ad5d634e3..97f4f8536f 100644
--- a/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt
+++ b/Tests/LibWeb/Layout/expected/table/rows-height-distribution-4.txt
@@ -16,7 +16,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                   "b"
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x300]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 200x300]
diff --git a/Tests/LibWeb/Layout/expected/table/rowspan.txt b/Tests/LibWeb/Layout/expected/table/rowspan.txt
index 1776a3a9cf..e733a733ab 100644
--- a/Tests/LibWeb/Layout/expected/table/rowspan.txt
+++ b/Tests/LibWeb/Layout/expected/table/rowspan.txt
@@ -110,7 +110,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,95.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x103.875]
     PaintableWithLines (BlockContainer(anonymous)) [0,0 800x0]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x87.875]
diff --git a/Tests/LibWeb/Layout/expected/table/size.txt b/Tests/LibWeb/Layout/expected/table/size.txt
index 834533313a..dc2a1b412a 100644
--- a/Tests/LibWeb/Layout/expected/table/size.txt
+++ b/Tests/LibWeb/Layout/expected/table/size.txt
@@ -15,7 +15,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               BlockContainer <(anonymous)> at (350,25.46875) content-size 100x0 children: inline
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 2350x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 2350x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600] overflow: [0,0 2350x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875] overflow: [8,8 2342x17.46875]
       PaintableWithLines (TableWrapper(anonymous)) [350,8 100x17.46875] overflow: [350,8 2000x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/stretch-to-fixed-height.txt b/Tests/LibWeb/Layout/expected/table/stretch-to-fixed-height.txt
index d6fb2c94bc..5509924ab3 100644
--- a/Tests/LibWeb/Layout/expected/table/stretch-to-fixed-height.txt
+++ b/Tests/LibWeb/Layout/expected/table/stretch-to-fixed-height.txt
@@ -10,7 +10,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x100]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 24x100]
diff --git a/Tests/LibWeb/Layout/expected/table/sum-of-percentage-column-widths-less-than-100.txt b/Tests/LibWeb/Layout/expected/table/sum-of-percentage-column-widths-less-than-100.txt
index 8d19de2e47..d318d9c161 100644
--- a/Tests/LibWeb/Layout/expected/table/sum-of-percentage-column-widths-less-than-100.txt
+++ b/Tests/LibWeb/Layout/expected/table/sum-of-percentage-column-widths-less-than-100.txt
@@ -33,7 +33,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x27.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 94x27.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt b/Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt
index fcc9399663..b851953773 100644
--- a/Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt
+++ b/Tests/LibWeb/Layout/expected/table/table-cell-not-paintable.txt
@@ -9,7 +9,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             Box <(anonymous)> at (13,19) content-size 0x0 table-row children: not-inline
               BlockContainer <(anonymous)> at (13,19) content-size 0x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<BUTTON>) [8,17 10x4]
diff --git a/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt b/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt
index 7b96b8b407..d953f181ea 100644
--- a/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt
+++ b/Tests/LibWeb/Layout/expected/table/table-formation-with-rowspan-in-the-middle.txt
@@ -85,7 +85,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <(anonymous)> at (8,167.875) content-size 784x0 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x159.875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 103.421875x159.875]
diff --git a/Tests/LibWeb/Layout/expected/table/table-header-and-footer-groups.txt b/Tests/LibWeb/Layout/expected/table/table-header-and-footer-groups.txt
index 9cfa9ae0b0..9be521f3f1 100644
--- a/Tests/LibWeb/Layout/expected/table/table-header-and-footer-groups.txt
+++ b/Tests/LibWeb/Layout/expected/table/table-header-and-footer-groups.txt
@@ -17,7 +17,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
                   "top"
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x218]
     PaintableWithLines (TableWrapper(anonymous)) [9,9 300x200]
       PaintableBox (Box<BODY>.table) [9,9 300x200]
diff --git a/Tests/LibWeb/Layout/expected/table/table-width.txt b/Tests/LibWeb/Layout/expected/table/table-width.txt
index eac950e45d..43119793df 100644
--- a/Tests/LibWeb/Layout/expected/table/table-width.txt
+++ b/Tests/LibWeb/Layout/expected/table/table-width.txt
@@ -7,7 +7,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             Box <tr> at (110,110) content-size 580x10 table-row children: not-inline
               BlockContainer <td.cell> at (111,115) content-size 578x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x214]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 784x214]
diff --git a/Tests/LibWeb/Layout/expected/table/td-valign.txt b/Tests/LibWeb/Layout/expected/table/td-valign.txt
index 6ad28e212f..d170a0e889 100644
--- a/Tests/LibWeb/Layout/expected/table/td-valign.txt
+++ b/Tests/LibWeb/Layout/expected/table/td-valign.txt
@@ -23,7 +23,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               BlockContainer <(anonymous)> (not painted) children: inline
                 TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x220]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x204]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 144.1875x204]
diff --git a/Tests/LibWeb/Layout/expected/table/top-caption-with-padding.txt b/Tests/LibWeb/Layout/expected/table/top-caption-with-padding.txt
index f923fb0843..d9d86fbbdf 100644
--- a/Tests/LibWeb/Layout/expected/table/top-caption-with-padding.txt
+++ b/Tests/LibWeb/Layout/expected/table/top-caption-with-padding.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,-2 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,-2 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600] overflow: [0,-2 800x602]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x60.9375] overflow: [8,-2 784x70.9375]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 60.46875x60.9375] overflow: [8,-2 60.46875x70.9375]
diff --git a/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-increased-size-on-col.txt b/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-increased-size-on-col.txt
index 6cee61301f..70f050655b 100644
--- a/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-increased-size-on-col.txt
+++ b/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-increased-size-on-col.txt
@@ -31,7 +31,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x27.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 420x27.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-size-on-col.txt b/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-size-on-col.txt
index 3adcaf7ed2..08c6627c5c 100644
--- a/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-size-on-col.txt
+++ b/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns-size-on-col.txt
@@ -31,7 +31,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x27.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 420x27.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns.txt b/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns.txt
index d04ba2f38c..146b21c4a9 100644
--- a/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns.txt
+++ b/Tests/LibWeb/Layout/expected/table/width-distribution-and-constrained-columns.txt
@@ -26,7 +26,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             BlockContainer <(anonymous)> (not painted) children: inline
               TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x27.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 420x27.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/width-distribution-of-max-width-increment.txt b/Tests/LibWeb/Layout/expected/table/width-distribution-of-max-width-increment.txt
index 790ea5d839..16acf79a5c 100644
--- a/Tests/LibWeb/Layout/expected/table/width-distribution-of-max-width-increment.txt
+++ b/Tests/LibWeb/Layout/expected/table/width-distribution-of-max-width-increment.txt
@@ -37,7 +37,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           BlockContainer <(anonymous)> (not painted) children: inline
             TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x21.46875]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 784x21.46875]
diff --git a/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt b/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt
index 97041d08ed..fe7e8ba031 100644
--- a/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt
+++ b/Tests/LibWeb/Layout/expected/table/zero-columns-gridmax.txt
@@ -6,7 +6,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
           Box <div.row> at (8,8) content-size 200x0 table-row children: not-inline
             BlockContainer <div.cell> at (8,8) content-size 200x0 table-cell [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x0]
       PaintableWithLines (TableWrapper(anonymous)) [8,8 200x0]
diff --git a/Tests/LibWeb/Layout/expected/text-align-justify-with-forced-break.txt b/Tests/LibWeb/Layout/expected/text-align-justify-with-forced-break.txt
index abff98e077..e76dc2c6c5 100644
--- a/Tests/LibWeb/Layout/expected/text-align-justify-with-forced-break.txt
+++ b/Tests/LibWeb/Layout/expected/text-align-justify-with-forced-break.txt
@@ -74,7 +74,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
         BreakNode <br>
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x118]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x102] overflow: [8,8 784x105.46875]
       PaintableWithLines (BlockContainer<DIV>) [8,8 102x102] overflow: [9,9 100.203125x104.46875]
diff --git a/Tests/LibWeb/Layout/expected/text-align-overflow.txt b/Tests/LibWeb/Layout/expected/text-align-overflow.txt
index 75b474a54f..3d3967428e 100644
--- a/Tests/LibWeb/Layout/expected/text-align-overflow.txt
+++ b/Tests/LibWeb/Layout/expected/text-align-overflow.txt
@@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "My super long message!"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x33.46875]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x17.46875]
       PaintableWithLines (BlockContainer<DIV>.outer) [18,8 80x17.46875]
diff --git a/Tests/LibWeb/Layout/expected/text-indent.txt b/Tests/LibWeb/Layout/expected/text-indent.txt
index 9bbc0dcc88..50e57fbe93 100644
--- a/Tests/LibWeb/Layout/expected/text-indent.txt
+++ b/Tests/LibWeb/Layout/expected/text-indent.txt
@@ -27,7 +27,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             "snab"
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x163.21875]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x145.21875]
       PaintableWithLines (BlockContainer<DIV>.px-indent) [10,10 780x70.9375]
diff --git a/Tests/LibWeb/Layout/expected/tolerate-css-percentage-overshoot.txt b/Tests/LibWeb/Layout/expected/tolerate-css-percentage-overshoot.txt
index 227a359015..29e97aff58 100644
--- a/Tests/LibWeb/Layout/expected/tolerate-css-percentage-overshoot.txt
+++ b/Tests/LibWeb/Layout/expected/tolerate-css-percentage-overshoot.txt
@@ -5,7 +5,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       BlockContainer <div.larg.green> at (216.328125,8) content-size 208.328125x100 floating [BFC] children: not-inline
       BlockContainer <div.smol.blue> at (424.65625,8) content-size 83.328125x100 floating [BFC] children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 500x0] overflow: [8,8 499.984375x100]
       PaintableWithLines (BlockContainer<DIV>.larg.red) [8,8 208.328125x100]
diff --git a/Tests/LibWeb/Layout/expected/transform-calc-length-values.txt b/Tests/LibWeb/Layout/expected/transform-calc-length-values.txt
index 93b810c1d0..a2f23c71cd 100644
--- a/Tests/LibWeb/Layout/expected/transform-calc-length-values.txt
+++ b/Tests/LibWeb/Layout/expected/transform-calc-length-values.txt
@@ -2,6 +2,6 @@ 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 (9,9) content-size 100x100 children: not-inline
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600]
+ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 102x102]
diff --git a/Tests/LibWeb/Layout/expected/vertical-padding-relative-to-cb-width.txt b/Tests/LibWeb/Layout/expected/vertical-padding-relative-to-cb-width.txt
index 09e0663cd8..ebbcf8fe3e 100644
--- a/Tests/LibWeb/Layout/expected/vertical-padding-relative-to-cb-width.txt
+++ b/Tests/LibWeb/Layout/expected/vertical-padding-relative-to-cb-width.txt
@@ -17,7 +17,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
               "bar"
           TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x602]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x602]
     PaintableWithLines (BlockContainer<BODY>) [9,9 782x14] overflow: [10,10 780x218.46875]
       PaintableWithLines (BlockContainer(anonymous)) [10,10 780x0]
diff --git a/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-1.txt b/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-1.txt
index fdb512c771..ec71322adb 100644
--- a/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-1.txt
+++ b/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-1.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 [BFC] children: not-inline
       BlockContainer <div> at (8,8) content-size 100x2000 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2016]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2016]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x2016]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x2000]
       PaintableWithLines (BlockContainer<DIV>) [8,8 100x2000]
diff --git a/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-2.txt b/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-2.txt
index f58bb6c517..dc4c1e68ee 100644
--- a/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-2.txt
+++ b/Tests/LibWeb/Layout/expected/viewport-overflow-propagation-2.txt
@@ -4,7 +4,7 @@ Viewport <#document> at (0,0) content-size 800x600 [BFC] children: not-inline
       BlockContainer <div.long> at (8,8) content-size 784x2000 children: inline
         TextNode <#text>
 
-PaintableWithLines (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2008]
+ViewportPaintable (Viewport<#document>) [0,0 800x600] overflow: [0,0 800x2008]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x616] overflow: [0,0 800x2008]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x600] overflow: [8,8 784x2000]
       PaintableWithLines (BlockContainer<DIV>.long) [8,8 784x2000]
diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt
index 418845499f..5f55da32ad 100644
--- a/Userland/Libraries/LibWeb/CMakeLists.txt
+++ b/Userland/Libraries/LibWeb/CMakeLists.txt
@@ -493,6 +493,7 @@ set(SOURCES
     Painting/TableBordersPainting.cpp
     Painting/TextPaintable.cpp
     Painting/VideoPaintable.cpp
+    Painting/ViewportPaintable.cpp
     PerformanceTimeline/EntryTypes.cpp
     PerformanceTimeline/PerformanceEntry.cpp
     PermissionsPolicy/AutoplayAllowlist.cpp
diff --git a/Userland/Libraries/LibWeb/Layout/Viewport.cpp b/Userland/Libraries/LibWeb/Layout/Viewport.cpp
index d693ec29bf..a3e1168435 100644
--- a/Userland/Libraries/LibWeb/Layout/Viewport.cpp
+++ b/Userland/Libraries/LibWeb/Layout/Viewport.cpp
@@ -9,6 +9,7 @@
 #include <LibWeb/Layout/Viewport.h>
 #include <LibWeb/Painting/PaintableBox.h>
 #include <LibWeb/Painting/StackingContext.h>
+#include <LibWeb/Painting/ViewportPaintable.h>
 
 namespace Web::Layout {
 
@@ -126,4 +127,9 @@ void Viewport::recompute_selection_states()
     }
 }
 
+JS::GCPtr<Painting::Paintable> Viewport::create_paintable() const
+{
+    return Painting::ViewportPaintable::create(*this);
+}
+
 }
diff --git a/Userland/Libraries/LibWeb/Layout/Viewport.h b/Userland/Libraries/LibWeb/Layout/Viewport.h
index 90f3f93653..485d67ae29 100644
--- a/Userland/Libraries/LibWeb/Layout/Viewport.h
+++ b/Userland/Libraries/LibWeb/Layout/Viewport.h
@@ -29,6 +29,8 @@ public:
     void recompute_selection_states();
 
 private:
+    virtual JS::GCPtr<Painting::Paintable> create_paintable() const override;
+
     void build_stacking_context_tree();
     virtual bool is_viewport() const override { return true; }
 };
diff --git a/Userland/Libraries/LibWeb/Painting/PaintableBox.h b/Userland/Libraries/LibWeb/Painting/PaintableBox.h
index 9d4f9c85b6..93dadf055c 100644
--- a/Userland/Libraries/LibWeb/Painting/PaintableBox.h
+++ b/Userland/Libraries/LibWeb/Painting/PaintableBox.h
@@ -218,7 +218,7 @@ private:
     Optional<TableCellCoordinates> m_table_cell_coordinates;
 };
 
-class PaintableWithLines final : public PaintableBox {
+class PaintableWithLines : public PaintableBox {
     JS_CELL(PaintableWithLines, PaintableBox);
 
 public:
diff --git a/Userland/Libraries/LibWeb/Painting/ViewportPaintable.cpp b/Userland/Libraries/LibWeb/Painting/ViewportPaintable.cpp
new file mode 100644
index 0000000000..d0bea390db
--- /dev/null
+++ b/Userland/Libraries/LibWeb/Painting/ViewportPaintable.cpp
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023, Andreas Kling <kling@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#include <LibWeb/Layout/Viewport.h>
+#include <LibWeb/Painting/ViewportPaintable.h>
+
+namespace Web::Painting {
+
+JS::NonnullGCPtr<ViewportPaintable> ViewportPaintable::create(Layout::Viewport const& layout_viewport)
+{
+    return layout_viewport.heap().allocate_without_realm<ViewportPaintable>(layout_viewport);
+}
+
+ViewportPaintable::ViewportPaintable(Layout::Viewport const& layout_viewport)
+    : PaintableWithLines(layout_viewport)
+{
+}
+
+ViewportPaintable::~ViewportPaintable() = default;
+
+}
diff --git a/Userland/Libraries/LibWeb/Painting/ViewportPaintable.h b/Userland/Libraries/LibWeb/Painting/ViewportPaintable.h
new file mode 100644
index 0000000000..f4ca864156
--- /dev/null
+++ b/Userland/Libraries/LibWeb/Painting/ViewportPaintable.h
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023, Andreas Kling <kling@serenityos.org>
+ *
+ * SPDX-License-Identifier: BSD-2-Clause
+ */
+
+#pragma once
+
+#include <LibWeb/Painting/PaintableBox.h>
+
+namespace Web::Painting {
+
+class ViewportPaintable final : public PaintableWithLines {
+    JS_CELL(ViewportPaintable, PaintableWithLines);
+
+public:
+    static JS::NonnullGCPtr<ViewportPaintable> create(Layout::Viewport const&);
+    virtual ~ViewportPaintable() override;
+
+private:
+    explicit ViewportPaintable(Layout::Viewport const&);
+};
+
+}