From 61114f6d16f674bebc4617ba64d1cc52681a9cd8 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Thu, 31 Jul 2025 23:07:26 +0200 Subject: [PATCH] LibWeb: Rename PaintContext to DisplayListRecordingContext PaintContext dates back to a time when display lists didn't exist and it truly represented "paint context". Renaming it to better align with its current role. --- Libraries/LibWeb/CMakeLists.txt | 2 +- .../CSS/StyleValues/AbstractImageStyleValue.h | 2 +- .../StyleValues/ConicGradientStyleValue.cpp | 2 +- .../CSS/StyleValues/ConicGradientStyleValue.h | 2 +- .../CSS/StyleValues/CursorStyleValue.cpp | 2 +- .../CSS/StyleValues/ImageStyleValue.cpp | 4 +-- .../LibWeb/CSS/StyleValues/ImageStyleValue.h | 2 +- .../StyleValues/LinearGradientStyleValue.cpp | 2 +- .../StyleValues/LinearGradientStyleValue.h | 2 +- .../StyleValues/RadialGradientStyleValue.cpp | 2 +- .../StyleValues/RadialGradientStyleValue.h | 2 +- Libraries/LibWeb/DOM/Document.cpp | 2 +- Libraries/LibWeb/Forward.h | 2 +- Libraries/LibWeb/Layout/Node.h | 6 ++-- Libraries/LibWeb/Painting/AudioPaintable.cpp | 2 +- Libraries/LibWeb/Painting/AudioPaintable.h | 2 +- .../LibWeb/Painting/BackgroundPainting.cpp | 4 +-- .../LibWeb/Painting/BackgroundPainting.h | 3 +- Libraries/LibWeb/Painting/BorderRadiiData.cpp | 2 +- .../Painting/BorderRadiusCornerClipper.cpp | 4 +-- .../Painting/BorderRadiusCornerClipper.h | 4 +-- Libraries/LibWeb/Painting/BordersData.cpp | 4 +-- Libraries/LibWeb/Painting/BordersData.h | 2 +- Libraries/LibWeb/Painting/CanvasPaintable.cpp | 3 +- Libraries/LibWeb/Painting/CanvasPaintable.h | 2 +- .../LibWeb/Painting/CheckBoxPaintable.cpp | 5 +-- Libraries/LibWeb/Painting/CheckBoxPaintable.h | 2 +- ...xt.cpp => DisplayListRecordingContext.cpp} | 32 +++++++++---------- ...ontext.h => DisplayListRecordingContext.h} | 8 ++--- .../LibWeb/Painting/FieldSetPaintable.cpp | 3 +- Libraries/LibWeb/Painting/FieldSetPaintable.h | 4 +-- Libraries/LibWeb/Painting/GradientPainting.h | 5 --- Libraries/LibWeb/Painting/ImagePaintable.cpp | 2 +- Libraries/LibWeb/Painting/ImagePaintable.h | 2 +- Libraries/LibWeb/Painting/MarkerPaintable.cpp | 2 +- Libraries/LibWeb/Painting/MarkerPaintable.h | 2 +- Libraries/LibWeb/Painting/MediaPaintable.cpp | 16 +++++----- Libraries/LibWeb/Painting/MediaPaintable.h | 16 +++++----- .../NavigableContainerViewportPaintable.cpp | 2 +- .../NavigableContainerViewportPaintable.h | 2 +- Libraries/LibWeb/Painting/Paintable.h | 6 ++-- Libraries/LibWeb/Painting/PaintableBox.cpp | 30 ++++++++--------- Libraries/LibWeb/Painting/PaintableBox.h | 32 +++++++++---------- .../LibWeb/Painting/RadioButtonPaintable.cpp | 2 +- .../LibWeb/Painting/RadioButtonPaintable.h | 2 +- .../Painting/SVGForeignObjectPaintable.cpp | 2 +- .../Painting/SVGForeignObjectPaintable.h | 4 +-- .../LibWeb/Painting/SVGGraphicsPaintable.h | 4 +-- Libraries/LibWeb/Painting/SVGMaskable.cpp | 2 +- Libraries/LibWeb/Painting/SVGMaskable.h | 3 +- .../LibWeb/Painting/SVGPathPaintable.cpp | 2 +- Libraries/LibWeb/Painting/SVGPathPaintable.h | 2 +- Libraries/LibWeb/Painting/SVGSVGPaintable.cpp | 4 +-- Libraries/LibWeb/Painting/SVGSVGPaintable.h | 4 +-- Libraries/LibWeb/Painting/ShadowPainting.cpp | 6 ++-- Libraries/LibWeb/Painting/ShadowPainting.h | 6 ++-- Libraries/LibWeb/Painting/StackingContext.cpp | 14 ++++---- Libraries/LibWeb/Painting/StackingContext.h | 12 +++---- .../LibWeb/Painting/TableBordersPainting.cpp | 10 +++--- .../LibWeb/Painting/TableBordersPainting.h | 4 +-- Libraries/LibWeb/Painting/VideoPaintable.cpp | 4 +-- Libraries/LibWeb/Painting/VideoPaintable.h | 4 +-- .../LibWeb/Painting/ViewportPaintable.cpp | 2 +- Libraries/LibWeb/Painting/ViewportPaintable.h | 2 +- Libraries/LibWeb/SVG/SVGDecodedImageData.cpp | 2 +- 65 files changed, 160 insertions(+), 174 deletions(-) rename Libraries/LibWeb/Painting/{PaintContext.cpp => DisplayListRecordingContext.cpp} (57%) rename Libraries/LibWeb/Painting/{PaintContext.h => DisplayListRecordingContext.h} (90%) diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 1ecc9acf5ff..6b67d82c057 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -729,6 +729,7 @@ set(SOURCES Painting/DisplayList.cpp Painting/DisplayListPlayerSkia.cpp Painting/DisplayListRecorder.cpp + Painting/DisplayListRecordingContext.cpp Painting/FieldSetPaintable.cpp Painting/GradientPainting.cpp Painting/ImagePaintable.cpp @@ -739,7 +740,6 @@ set(SOURCES Painting/Paintable.cpp Painting/PaintableBox.cpp Painting/PaintableFragment.cpp - Painting/PaintContext.cpp Painting/RadioButtonPaintable.cpp Painting/ScrollFrame.cpp Painting/ScrollState.cpp diff --git a/Libraries/LibWeb/CSS/StyleValues/AbstractImageStyleValue.h b/Libraries/LibWeb/CSS/StyleValues/AbstractImageStyleValue.h index 43fa8346bad..2d0f7c0b7ce 100644 --- a/Libraries/LibWeb/CSS/StyleValues/AbstractImageStyleValue.h +++ b/Libraries/LibWeb/CSS/StyleValues/AbstractImageStyleValue.h @@ -37,7 +37,7 @@ public: virtual void resolve_for_size(Layout::NodeWithStyle const&, CSSPixelSize) const { } virtual bool is_paintable() const = 0; - virtual void paint(PaintContext& context, DevicePixelRect const& dest_rect, ImageRendering) const = 0; + virtual void paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, ImageRendering) const = 0; virtual Optional color_if_single_pixel_bitmap() const { return {}; } }; diff --git a/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp b/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp index c160bc2724d..1304805e7b1 100644 --- a/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.cpp @@ -56,7 +56,7 @@ void ConicGradientStyleValue::resolve_for_size(Layout::NodeWithStyle const& node m_resolved->position = m_properties.position->resolved(node, CSSPixelRect { { 0, 0 }, size }); } -void ConicGradientStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering) const +void ConicGradientStyleValue::paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering) const { VERIFY(m_resolved.has_value()); auto destination_rect = dest_rect.to_type(); diff --git a/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.h b/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.h index e8955160e70..c8980fcb2fe 100644 --- a/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.h +++ b/Libraries/LibWeb/CSS/StyleValues/ConicGradientStyleValue.h @@ -26,7 +26,7 @@ public: virtual String to_string(SerializationMode) const override; - void paint(PaintContext&, DevicePixelRect const& dest_rect, CSS::ImageRendering) const override; + void paint(DisplayListRecordingContext&, DevicePixelRect const& dest_rect, CSS::ImageRendering) const override; virtual bool equals(CSSStyleValue const& other) const override; diff --git a/Libraries/LibWeb/CSS/StyleValues/CursorStyleValue.cpp b/Libraries/LibWeb/CSS/StyleValues/CursorStyleValue.cpp index 584efac9874..eb8b6853a2f 100644 --- a/Libraries/LibWeb/CSS/StyleValues/CursorStyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/CursorStyleValue.cpp @@ -84,7 +84,7 @@ Optional CursorStyleValue::make_image_cursor(Layout::NodeWithS // Paint the cursor into a bitmap. auto display_list = Painting::DisplayList::create(document.page().client().device_pixels_per_css_pixel()); Painting::DisplayListRecorder display_list_recorder(display_list); - PaintContext paint_context { display_list_recorder, document.page().palette(), document.page().client().device_pixels_per_css_pixel() }; + DisplayListRecordingContext paint_context { display_list_recorder, document.page().palette(), document.page().client().device_pixels_per_css_pixel() }; image.resolve_for_size(layout_node, CSSPixelSize { bitmap.size() }); image.paint(paint_context, DevicePixelRect { bitmap.rect() }, ImageRendering::Auto); diff --git a/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.cpp b/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.cpp index b6c36b19a76..117cdc1002a 100644 --- a/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include namespace Web::CSS { @@ -150,7 +150,7 @@ Optional ImageStyleValue::natural_aspect_ratio() const return {}; } -void ImageStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering image_rendering) const +void ImageStyleValue::paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering image_rendering) const { if (auto const* b = bitmap(m_current_frame_index, dest_rect.size().to_type()); b != nullptr) { auto scaling_mode = to_gfx_scaling_mode(image_rendering, b->rect(), dest_rect.to_type()); diff --git a/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.h b/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.h index 6eb6ef97780..760ccf6bfd9 100644 --- a/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.h +++ b/Libraries/LibWeb/CSS/StyleValues/ImageStyleValue.h @@ -52,7 +52,7 @@ public: Optional natural_aspect_ratio() const override; virtual bool is_paintable() const override; - void paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering image_rendering) const override; + void paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering image_rendering) const override; virtual Optional color_if_single_pixel_bitmap() const override; Gfx::ImmutableBitmap const* current_frame_bitmap(DevicePixelRect const& dest_rect) const; diff --git a/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp b/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp index 3491d00a553..a44bd5b5c4c 100644 --- a/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.cpp @@ -131,7 +131,7 @@ void LinearGradientStyleValue::resolve_for_size(Layout::NodeWithStyle const& nod } } -void LinearGradientStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering) const +void LinearGradientStyleValue::paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering) const { VERIFY(m_resolved.has_value()); context.display_list_recorder().fill_rect_with_linear_gradient(dest_rect.to_type(), m_resolved.value()); diff --git a/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.h b/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.h index fc3b07d8a35..2154668a535 100644 --- a/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.h +++ b/Libraries/LibWeb/CSS/StyleValues/LinearGradientStyleValue.h @@ -73,7 +73,7 @@ public: void resolve_for_size(Layout::NodeWithStyle const&, CSSPixelSize) const override; bool is_paintable() const override { return true; } - void paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering image_rendering) const override; + void paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering image_rendering) const override; private: LinearGradientStyleValue(GradientDirection direction, Vector color_stop_list, GradientType type, GradientRepeating repeating, Optional interpolation_method, ColorSyntax color_syntax) diff --git a/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp b/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp index 1adef4e4c72..7abe1bab159 100644 --- a/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp +++ b/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.cpp @@ -246,7 +246,7 @@ bool RadialGradientStyleValue::equals(CSSStyleValue const& other) const return m_properties == other_gradient.m_properties; } -void RadialGradientStyleValue::paint(PaintContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering) const +void RadialGradientStyleValue::paint(DisplayListRecordingContext& context, DevicePixelRect const& dest_rect, CSS::ImageRendering) const { VERIFY(m_resolved.has_value()); auto center = context.rounded_device_point(m_resolved->center).to_type(); diff --git a/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.h b/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.h index 46c91c58dd0..deabc61256b 100644 --- a/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.h +++ b/Libraries/LibWeb/CSS/StyleValues/RadialGradientStyleValue.h @@ -52,7 +52,7 @@ public: virtual String to_string(SerializationMode) const override; - void paint(PaintContext&, DevicePixelRect const& dest_rect, CSS::ImageRendering) const override; + void paint(DisplayListRecordingContext&, DevicePixelRect const& dest_rect, CSS::ImageRendering) const override; virtual bool equals(CSSStyleValue const& other) const override; diff --git a/Libraries/LibWeb/DOM/Document.cpp b/Libraries/LibWeb/DOM/Document.cpp index 7b47e8ef9dd..536cb8f1386 100644 --- a/Libraries/LibWeb/DOM/Document.cpp +++ b/Libraries/LibWeb/DOM/Document.cpp @@ -6461,7 +6461,7 @@ RefPtr Document::record_display_list(HTML::PaintConfig co VERIFY_NOT_REACHED(); } - Web::PaintContext context(display_list_recorder, page().palette(), page().client().device_pixels_per_css_pixel()); + Web::DisplayListRecordingContext context(display_list_recorder, page().palette(), page().client().device_pixels_per_css_pixel()); context.set_device_viewport_rect(viewport_rect); context.set_should_show_line_box_borders(config.should_show_line_box_borders); context.set_should_paint_overlay(config.paint_overlay); diff --git a/Libraries/LibWeb/Forward.h b/Libraries/LibWeb/Forward.h index 9f781ba235c..989c6c6e58c 100644 --- a/Libraries/LibWeb/Forward.h +++ b/Libraries/LibWeb/Forward.h @@ -14,13 +14,13 @@ namespace Web { +class DisplayListRecordingContext; class DragAndDropEventHandler; class EventHandler; class InputEventsTarget; class LoadRequest; class Page; class PageClient; -class PaintContext; class Resource; class ResourceLoader; class XMLDocumentBuilder; diff --git a/Libraries/LibWeb/Layout/Node.h b/Libraries/LibWeb/Layout/Node.h index cb3ff619455..92dfb60d73a 100644 --- a/Libraries/LibWeb/Layout/Node.h +++ b/Libraries/LibWeb/Layout/Node.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include @@ -152,7 +152,7 @@ public: bool can_contain_boxes_with_position_absolute() const; Gfx::Font const& first_available_font() const; - Gfx::Font const& font(PaintContext&) const; + Gfx::Font const& font(DisplayListRecordingContext&) const; Gfx::Font const& font(float scale_factor) const; CSS::ImmutableComputedValues const& computed_values() const; @@ -320,7 +320,7 @@ inline Gfx::Font const& Node::first_available_font() const return parent()->first_available_font(); } -inline Gfx::Font const& Node::font(PaintContext& context) const +inline Gfx::Font const& Node::font(DisplayListRecordingContext& context) const { return font(context.device_pixels_per_css_pixel()); } diff --git a/Libraries/LibWeb/Painting/AudioPaintable.cpp b/Libraries/LibWeb/Painting/AudioPaintable.cpp index a15764b6cf9..7a9a579a1ca 100644 --- a/Libraries/LibWeb/Painting/AudioPaintable.cpp +++ b/Libraries/LibWeb/Painting/AudioPaintable.cpp @@ -39,7 +39,7 @@ Layout::AudioBox const& AudioPaintable::layout_box() const return static_cast(layout_node()); } -void AudioPaintable::paint(PaintContext& context, PaintPhase phase) const +void AudioPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/AudioPaintable.h b/Libraries/LibWeb/Painting/AudioPaintable.h index 2b712d3280c..e696605d1c4 100644 --- a/Libraries/LibWeb/Painting/AudioPaintable.h +++ b/Libraries/LibWeb/Painting/AudioPaintable.h @@ -18,7 +18,7 @@ class AudioPaintable final : public MediaPaintable { public: static GC::Ref create(Layout::AudioBox const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::AudioBox& layout_box(); Layout::AudioBox const& layout_box() const; diff --git a/Libraries/LibWeb/Painting/BackgroundPainting.cpp b/Libraries/LibWeb/Painting/BackgroundPainting.cpp index 8c8e5330067..d0766b7e367 100644 --- a/Libraries/LibWeb/Painting/BackgroundPainting.cpp +++ b/Libraries/LibWeb/Painting/BackgroundPainting.cpp @@ -18,7 +18,7 @@ namespace Web::Painting { -static RefPtr compute_text_clip_paths(PaintContext& context, Paintable const& paintable, CSSPixelPoint containing_block_location) +static RefPtr compute_text_clip_paths(DisplayListRecordingContext& context, Paintable const& paintable, CSSPixelPoint containing_block_location) { auto text_clip_paths = DisplayList::create(context.device_pixels_per_css_pixel()); DisplayListRecorder display_list_recorder(*text_clip_paths); @@ -75,7 +75,7 @@ static BackgroundBox get_box(CSS::BackgroundBox box_clip, BackgroundBox border_b } // https://www.w3.org/TR/css-backgrounds-3/#backgrounds -void paint_background(PaintContext& context, PaintableBox const& paintable_box, CSS::ImageRendering image_rendering, ResolvedBackground resolved_background, BorderRadiiData const& border_radii) +void paint_background(DisplayListRecordingContext& context, PaintableBox const& paintable_box, CSS::ImageRendering image_rendering, ResolvedBackground resolved_background, BorderRadiiData const& border_radii) { auto& display_list_recorder = context.display_list_recorder(); diff --git a/Libraries/LibWeb/Painting/BackgroundPainting.h b/Libraries/LibWeb/Painting/BackgroundPainting.h index 2f03aece225..aaba876eb85 100644 --- a/Libraries/LibWeb/Painting/BackgroundPainting.h +++ b/Libraries/LibWeb/Painting/BackgroundPainting.h @@ -8,7 +8,6 @@ #include #include -#include namespace Web::Painting { @@ -48,6 +47,6 @@ struct ResolvedBackground { ResolvedBackground resolve_background_layers(Vector const& layers, PaintableBox const& paintable_box, Color background_color, CSSPixelRect const& border_rect, BorderRadiiData const& border_radii); -void paint_background(PaintContext&, PaintableBox const&, CSS::ImageRendering, ResolvedBackground resolved_background, BorderRadiiData const&); +void paint_background(DisplayListRecordingContext&, PaintableBox const&, CSS::ImageRendering, ResolvedBackground resolved_background, BorderRadiiData const&); } diff --git a/Libraries/LibWeb/Painting/BorderRadiiData.cpp b/Libraries/LibWeb/Painting/BorderRadiiData.cpp index e5467844aa8..14c3fae92d1 100644 --- a/Libraries/LibWeb/Painting/BorderRadiiData.cpp +++ b/Libraries/LibWeb/Painting/BorderRadiiData.cpp @@ -6,7 +6,7 @@ */ #include -#include +#include namespace Web::Painting { diff --git a/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.cpp b/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.cpp index db49ae77ae8..e1251436a66 100644 --- a/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.cpp +++ b/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.cpp @@ -6,11 +6,11 @@ #include #include -#include +#include namespace Web::Painting { -ScopedCornerRadiusClip::ScopedCornerRadiusClip(PaintContext& context, DevicePixelRect const& border_rect, BorderRadiiData const& border_radii, CornerClip corner_clip, bool do_apply) +ScopedCornerRadiusClip::ScopedCornerRadiusClip(DisplayListRecordingContext& context, DevicePixelRect const& border_rect, BorderRadiiData const& border_radii, CornerClip corner_clip, bool do_apply) : m_context(context) { m_do_apply = do_apply; diff --git a/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.h b/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.h index 7bc72d7e5d2..3a42c60f5b1 100644 --- a/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.h +++ b/Libraries/LibWeb/Painting/BorderRadiusCornerClipper.h @@ -16,7 +16,7 @@ enum class CornerClip { }; struct ScopedCornerRadiusClip { - ScopedCornerRadiusClip(PaintContext& context, DevicePixelRect const& border_rect, BorderRadiiData const& border_radii, CornerClip corner_clip = CornerClip::Outside, bool do_apply = true); + ScopedCornerRadiusClip(DisplayListRecordingContext& context, DevicePixelRect const& border_rect, BorderRadiiData const& border_radii, CornerClip corner_clip = CornerClip::Outside, bool do_apply = true); ~ScopedCornerRadiusClip(); @@ -24,7 +24,7 @@ struct ScopedCornerRadiusClip { AK_MAKE_NONCOPYABLE(ScopedCornerRadiusClip); private: - PaintContext& m_context; + DisplayListRecordingContext& m_context; bool m_has_radius { false }; bool m_do_apply; }; diff --git a/Libraries/LibWeb/Painting/BordersData.cpp b/Libraries/LibWeb/Painting/BordersData.cpp index 474c5234507..7b65e11321b 100644 --- a/Libraries/LibWeb/Painting/BordersData.cpp +++ b/Libraries/LibWeb/Painting/BordersData.cpp @@ -5,11 +5,11 @@ */ #include -#include +#include namespace Web::Painting { -BordersDataDevicePixels BordersData::to_device_pixels(PaintContext const& context) const +BordersDataDevicePixels BordersData::to_device_pixels(DisplayListRecordingContext const& context) const { return BordersDataDevicePixels { BorderDataDevicePixels { diff --git a/Libraries/LibWeb/Painting/BordersData.h b/Libraries/LibWeb/Painting/BordersData.h index b66e210854b..f55178e01ab 100644 --- a/Libraries/LibWeb/Painting/BordersData.h +++ b/Libraries/LibWeb/Painting/BordersData.h @@ -34,7 +34,7 @@ struct BordersData { CSS::BorderData bottom; CSS::BorderData left; - BordersDataDevicePixels to_device_pixels(PaintContext const& context) const; + BordersDataDevicePixels to_device_pixels(DisplayListRecordingContext const& context) const; }; } diff --git a/Libraries/LibWeb/Painting/CanvasPaintable.cpp b/Libraries/LibWeb/Painting/CanvasPaintable.cpp index 8aed75f35dc..dc031257056 100644 --- a/Libraries/LibWeb/Painting/CanvasPaintable.cpp +++ b/Libraries/LibWeb/Painting/CanvasPaintable.cpp @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include #include @@ -27,7 +26,7 @@ Layout::CanvasBox const& CanvasPaintable::layout_box() const return static_cast(layout_node()); } -void CanvasPaintable::paint(PaintContext& context, PaintPhase phase) const +void CanvasPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/CanvasPaintable.h b/Libraries/LibWeb/Painting/CanvasPaintable.h index 37b9ecf7b43..e68e4491839 100644 --- a/Libraries/LibWeb/Painting/CanvasPaintable.h +++ b/Libraries/LibWeb/Painting/CanvasPaintable.h @@ -18,7 +18,7 @@ class CanvasPaintable final : public PaintableBox { public: static GC::Ref create(Layout::CanvasBox const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::CanvasBox const& layout_box() const; diff --git a/Libraries/LibWeb/Painting/CheckBoxPaintable.cpp b/Libraries/LibWeb/Painting/CheckBoxPaintable.cpp index 176108a5668..b2c295b6a7f 100644 --- a/Libraries/LibWeb/Painting/CheckBoxPaintable.cpp +++ b/Libraries/LibWeb/Painting/CheckBoxPaintable.cpp @@ -5,12 +5,9 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include -#include #include #include #include -#include #include #include #include @@ -58,7 +55,7 @@ Layout::CheckBox& CheckBoxPaintable::layout_box() return static_cast(layout_node()); } -void CheckBoxPaintable::paint(PaintContext& context, PaintPhase phase) const +void CheckBoxPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/CheckBoxPaintable.h b/Libraries/LibWeb/Painting/CheckBoxPaintable.h index 9fdf824c019..5a6a0fd32c8 100644 --- a/Libraries/LibWeb/Painting/CheckBoxPaintable.h +++ b/Libraries/LibWeb/Painting/CheckBoxPaintable.h @@ -21,7 +21,7 @@ public: Layout::CheckBox const& layout_box() const; Layout::CheckBox& layout_box(); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; private: CheckBoxPaintable(Layout::CheckBox const&); diff --git a/Libraries/LibWeb/Painting/PaintContext.cpp b/Libraries/LibWeb/Painting/DisplayListRecordingContext.cpp similarity index 57% rename from Libraries/LibWeb/Painting/PaintContext.cpp rename to Libraries/LibWeb/Painting/DisplayListRecordingContext.cpp index 01055e9f6ba..bc32a9cae10 100644 --- a/Libraries/LibWeb/Painting/PaintContext.cpp +++ b/Libraries/LibWeb/Painting/DisplayListRecordingContext.cpp @@ -5,13 +5,13 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include namespace Web { static u64 s_next_paint_generation_id = 0; -PaintContext::PaintContext(Painting::DisplayListRecorder& display_list_recorder, Palette const& palette, double device_pixels_per_css_pixel) +DisplayListRecordingContext::DisplayListRecordingContext(Painting::DisplayListRecorder& display_list_recorder, Palette const& palette, double device_pixels_per_css_pixel) : m_display_list_recorder(display_list_recorder) , m_palette(palette) , m_device_pixel_converter(device_pixels_per_css_pixel) @@ -19,7 +19,7 @@ PaintContext::PaintContext(Painting::DisplayListRecorder& display_list_recorder, { } -CSSPixelRect PaintContext::css_viewport_rect() const +CSSPixelRect DisplayListRecordingContext::css_viewport_rect() const { return { m_device_viewport_rect.x().value() / m_device_pixel_converter.device_pixels_per_css_pixel(), @@ -29,57 +29,57 @@ CSSPixelRect PaintContext::css_viewport_rect() const }; } -DevicePixels PaintContext::rounded_device_pixels(CSSPixels css_pixels) const +DevicePixels DisplayListRecordingContext::rounded_device_pixels(CSSPixels css_pixels) const { return m_device_pixel_converter.rounded_device_pixels(css_pixels); } -DevicePixels PaintContext::enclosing_device_pixels(CSSPixels css_pixels) const +DevicePixels DisplayListRecordingContext::enclosing_device_pixels(CSSPixels css_pixels) const { return m_device_pixel_converter.enclosing_device_pixels(css_pixels); } -DevicePixels PaintContext::floored_device_pixels(CSSPixels css_pixels) const +DevicePixels DisplayListRecordingContext::floored_device_pixels(CSSPixels css_pixels) const { return m_device_pixel_converter.floored_device_pixels(css_pixels); } -DevicePixelPoint PaintContext::rounded_device_point(CSSPixelPoint point) const +DevicePixelPoint DisplayListRecordingContext::rounded_device_point(CSSPixelPoint point) const { return m_device_pixel_converter.rounded_device_point(point); } -DevicePixelPoint PaintContext::floored_device_point(CSSPixelPoint point) const +DevicePixelPoint DisplayListRecordingContext::floored_device_point(CSSPixelPoint point) const { return m_device_pixel_converter.floored_device_point(point); } -DevicePixelRect PaintContext::enclosing_device_rect(CSSPixelRect rect) const +DevicePixelRect DisplayListRecordingContext::enclosing_device_rect(CSSPixelRect rect) const { return m_device_pixel_converter.enclosing_device_rect(rect); } -DevicePixelRect PaintContext::rounded_device_rect(CSSPixelRect rect) const +DevicePixelRect DisplayListRecordingContext::rounded_device_rect(CSSPixelRect rect) const { return m_device_pixel_converter.rounded_device_rect(rect); } -DevicePixelSize PaintContext::enclosing_device_size(CSSPixelSize size) const +DevicePixelSize DisplayListRecordingContext::enclosing_device_size(CSSPixelSize size) const { return m_device_pixel_converter.enclosing_device_size(size); } -DevicePixelSize PaintContext::rounded_device_size(CSSPixelSize size) const +DevicePixelSize DisplayListRecordingContext::rounded_device_size(CSSPixelSize size) const { return m_device_pixel_converter.rounded_device_size(size); } -CSSPixels PaintContext::scale_to_css_pixels(DevicePixels device_pixels) const +CSSPixels DisplayListRecordingContext::scale_to_css_pixels(DevicePixels device_pixels) const { return CSSPixels::nearest_value_for(device_pixels.value() / m_device_pixel_converter.device_pixels_per_css_pixel()); } -CSSPixelPoint PaintContext::scale_to_css_point(DevicePixelPoint point) const +CSSPixelPoint DisplayListRecordingContext::scale_to_css_point(DevicePixelPoint point) const { return { scale_to_css_pixels(point.x()), @@ -87,7 +87,7 @@ CSSPixelPoint PaintContext::scale_to_css_point(DevicePixelPoint point) const }; } -CSSPixelSize PaintContext::scale_to_css_size(DevicePixelSize size) const +CSSPixelSize DisplayListRecordingContext::scale_to_css_size(DevicePixelSize size) const { return { scale_to_css_pixels(size.width()), @@ -95,7 +95,7 @@ CSSPixelSize PaintContext::scale_to_css_size(DevicePixelSize size) const }; } -CSSPixelRect PaintContext::scale_to_css_rect(DevicePixelRect rect) const +CSSPixelRect DisplayListRecordingContext::scale_to_css_rect(DevicePixelRect rect) const { return { scale_to_css_point(rect.location()), diff --git a/Libraries/LibWeb/Painting/PaintContext.h b/Libraries/LibWeb/Painting/DisplayListRecordingContext.h similarity index 90% rename from Libraries/LibWeb/Painting/PaintContext.h rename to Libraries/LibWeb/Painting/DisplayListRecordingContext.h index 563625f8713..8c93dd86e66 100644 --- a/Libraries/LibWeb/Painting/PaintContext.h +++ b/Libraries/LibWeb/Painting/DisplayListRecordingContext.h @@ -16,9 +16,9 @@ namespace Web { -class PaintContext { +class DisplayListRecordingContext { public: - PaintContext(Painting::DisplayListRecorder& painter, Palette const& palette, double device_pixels_per_css_pixel); + DisplayListRecordingContext(Painting::DisplayListRecorder& painter, Palette const& palette, double device_pixels_per_css_pixel); Painting::DisplayListRecorder& display_list_recorder() const { return m_display_list_recorder; } Palette const& palette() const { return m_palette; } @@ -67,9 +67,9 @@ public: CSSPixelSize scale_to_css_size(DevicePixelSize) const; CSSPixelRect scale_to_css_rect(DevicePixelRect) const; - PaintContext clone(Painting::DisplayListRecorder& painter) const + DisplayListRecordingContext clone(Painting::DisplayListRecorder& painter) const { - auto clone = PaintContext(painter, m_palette, m_device_pixel_converter.device_pixels_per_css_pixel()); + auto clone = DisplayListRecordingContext(painter, m_palette, m_device_pixel_converter.device_pixels_per_css_pixel()); clone.m_device_viewport_rect = m_device_viewport_rect; clone.m_should_show_line_box_borders = m_should_show_line_box_borders; clone.m_should_paint_overlay = m_should_paint_overlay; diff --git a/Libraries/LibWeb/Painting/FieldSetPaintable.cpp b/Libraries/LibWeb/Painting/FieldSetPaintable.cpp index 9580f8456fa..315173bac6b 100644 --- a/Libraries/LibWeb/Painting/FieldSetPaintable.cpp +++ b/Libraries/LibWeb/Painting/FieldSetPaintable.cpp @@ -4,6 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ +#include #include #include #include @@ -32,7 +33,7 @@ Layout::FieldSetBox const& FieldSetPaintable::layout_box() const return static_cast(layout_node()); } -void FieldSetPaintable::paint(PaintContext& context, PaintPhase phase) const +void FieldSetPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/FieldSetPaintable.h b/Libraries/LibWeb/Painting/FieldSetPaintable.h index ed7d3daddf6..18609913447 100644 --- a/Libraries/LibWeb/Painting/FieldSetPaintable.h +++ b/Libraries/LibWeb/Painting/FieldSetPaintable.h @@ -7,8 +7,6 @@ #pragma once #include -#include -#include #include namespace Web::Painting { @@ -20,7 +18,7 @@ class FieldSetPaintable final : public PaintableBox { public: static GC::Ref create(Layout::FieldSetBox const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; private: Layout::FieldSetBox& layout_box(); diff --git a/Libraries/LibWeb/Painting/GradientPainting.h b/Libraries/LibWeb/Painting/GradientPainting.h index 4fdfbcc0b35..606682622be 100644 --- a/Libraries/LibWeb/Painting/GradientPainting.h +++ b/Libraries/LibWeb/Painting/GradientPainting.h @@ -6,13 +6,8 @@ #pragma once -#include -#include -#include -#include #include #include -#include namespace Web::Painting { diff --git a/Libraries/LibWeb/Painting/ImagePaintable.cpp b/Libraries/LibWeb/Painting/ImagePaintable.cpp index 11e626d6f6e..bf152079f4b 100644 --- a/Libraries/LibWeb/Painting/ImagePaintable.cpp +++ b/Libraries/LibWeb/Painting/ImagePaintable.cpp @@ -57,7 +57,7 @@ void ImagePaintable::finalize() document().unregister_viewport_client(*this); } -void ImagePaintable::paint(PaintContext& context, PaintPhase phase) const +void ImagePaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/ImagePaintable.h b/Libraries/LibWeb/Painting/ImagePaintable.h index f7c3508208f..88699f44b84 100644 --- a/Libraries/LibWeb/Painting/ImagePaintable.h +++ b/Libraries/LibWeb/Painting/ImagePaintable.h @@ -22,7 +22,7 @@ public: static GC::Ref create(Layout::ImageBox const& layout_box); static GC::Ref create(Layout::SVGImageBox const& layout_box); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; private: // ^JS::Cell diff --git a/Libraries/LibWeb/Painting/MarkerPaintable.cpp b/Libraries/LibWeb/Painting/MarkerPaintable.cpp index 6c7848d33b4..804085c1074 100644 --- a/Libraries/LibWeb/Painting/MarkerPaintable.cpp +++ b/Libraries/LibWeb/Painting/MarkerPaintable.cpp @@ -30,7 +30,7 @@ Layout::ListItemMarkerBox const& MarkerPaintable::layout_box() const constexpr float sin_60_deg = 0.866025403f; -void MarkerPaintable::paint(PaintContext& context, PaintPhase phase) const +void MarkerPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/MarkerPaintable.h b/Libraries/LibWeb/Painting/MarkerPaintable.h index f50b2515c88..cd4744f2c53 100644 --- a/Libraries/LibWeb/Painting/MarkerPaintable.h +++ b/Libraries/LibWeb/Painting/MarkerPaintable.h @@ -18,7 +18,7 @@ class MarkerPaintable final : public PaintableBox { public: static GC::Ref create(Layout::ListItemMarkerBox const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::ListItemMarkerBox const& layout_box() const; diff --git a/Libraries/LibWeb/Painting/MediaPaintable.cpp b/Libraries/LibWeb/Painting/MediaPaintable.cpp index 3b0bdec0f2a..4d171e4cc32 100644 --- a/Libraries/LibWeb/Painting/MediaPaintable.cpp +++ b/Libraries/LibWeb/Painting/MediaPaintable.cpp @@ -35,7 +35,7 @@ MediaPaintable::MediaPaintable(Layout::ReplacedBox const& layout_box) { } -Optional MediaPaintable::mouse_position(PaintContext& context, HTML::HTMLMediaElement const& media_element) +Optional MediaPaintable::mouse_position(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element) { auto const& layout_mouse_position = media_element.layout_mouse_position({}); @@ -59,7 +59,7 @@ void MediaPaintable::fill_triangle(DisplayListRecorder& painter, Gfx::IntPoint l }); } -void MediaPaintable::paint_media_controls(PaintContext& context, HTML::HTMLMediaElement const& media_element, DevicePixelRect media_rect, Optional const& mouse_position) const +void MediaPaintable::paint_media_controls(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element, DevicePixelRect media_rect, Optional const& mouse_position) const { auto components = compute_control_bar_components(context, media_element, media_rect); context.display_list_recorder().fill_rect(components.control_box_rect.to_type(), CONTROL_BOX_COLOR.with_alpha(0xd0)); @@ -71,7 +71,7 @@ void MediaPaintable::paint_media_controls(PaintContext& context, HTML::HTMLMedia paint_control_bar_volume(context, media_element, components, mouse_position); } -MediaPaintable::Components MediaPaintable::compute_control_bar_components(PaintContext& context, HTML::HTMLMediaElement const& media_element, DevicePixelRect media_rect) const +MediaPaintable::Components MediaPaintable::compute_control_bar_components(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element, DevicePixelRect media_rect) const { auto maximum_control_box_height = context.rounded_device_pixels(40); auto component_padding = context.rounded_device_pixels(5); @@ -138,7 +138,7 @@ MediaPaintable::Components MediaPaintable::compute_control_bar_components(PaintC return components; } -void MediaPaintable::paint_control_bar_playback_button(PaintContext& context, HTML::HTMLMediaElement const& media_element, Components const& components, Optional const& mouse_position) +void MediaPaintable::paint_control_bar_playback_button(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element, Components const& components, Optional const& mouse_position) { auto playback_button_size = components.playback_button_rect.width() * 4 / 10; @@ -172,7 +172,7 @@ void MediaPaintable::paint_control_bar_playback_button(PaintContext& context, HT } } -void MediaPaintable::paint_control_bar_timeline(PaintContext& context, HTML::HTMLMediaElement const& media_element, Components const& components) +void MediaPaintable::paint_control_bar_timeline(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element, Components const& components) { if (components.timeline_rect.is_empty()) return; @@ -190,7 +190,7 @@ void MediaPaintable::paint_control_bar_timeline(PaintContext& context, HTML::HTM context.display_list_recorder().fill_rect(timeline_future_rect.to_type(), Color::Black); } -void MediaPaintable::paint_control_bar_timestamp(PaintContext& context, Components const& components) +void MediaPaintable::paint_control_bar_timestamp(DisplayListRecordingContext& context, Components const& components) { if (components.timestamp_rect.is_empty()) return; @@ -198,7 +198,7 @@ void MediaPaintable::paint_control_bar_timestamp(PaintContext& context, Componen context.display_list_recorder().draw_text(components.timestamp_rect.to_type(), components.timestamp, *components.timestamp_font, Gfx::TextAlignment::CenterLeft, Color::White); } -void MediaPaintable::paint_control_bar_speaker(PaintContext& context, HTML::HTMLMediaElement const& media_element, Components const& components, Optional const& mouse_position) +void MediaPaintable::paint_control_bar_speaker(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element, Components const& components, Optional const& mouse_position) { if (components.speaker_button_rect.is_empty()) return; @@ -252,7 +252,7 @@ void MediaPaintable::paint_control_bar_speaker(PaintContext& context, HTML::HTML } } -void MediaPaintable::paint_control_bar_volume(PaintContext& context, HTML::HTMLMediaElement const& media_element, Components const& components, Optional const& mouse_position) +void MediaPaintable::paint_control_bar_volume(DisplayListRecordingContext& context, HTML::HTMLMediaElement const& media_element, Components const& components, Optional const& mouse_position) { if (components.volume_rect.is_empty()) return; diff --git a/Libraries/LibWeb/Painting/MediaPaintable.h b/Libraries/LibWeb/Painting/MediaPaintable.h index 6d9b8f850f0..b72f9b14448 100644 --- a/Libraries/LibWeb/Painting/MediaPaintable.h +++ b/Libraries/LibWeb/Painting/MediaPaintable.h @@ -19,10 +19,10 @@ class MediaPaintable : public PaintableBox { protected: explicit MediaPaintable(Layout::ReplacedBox const&); - static Optional mouse_position(PaintContext&, HTML::HTMLMediaElement const&); + static Optional mouse_position(DisplayListRecordingContext&, HTML::HTMLMediaElement const&); static void fill_triangle(DisplayListRecorder& painter, Gfx::IntPoint location, Array coordinates, Color color); - void paint_media_controls(PaintContext&, HTML::HTMLMediaElement const&, DevicePixelRect media_rect, Optional const& mouse_position) const; + void paint_media_controls(DisplayListRecordingContext&, HTML::HTMLMediaElement const&, DevicePixelRect media_rect, Optional const& mouse_position) const; private: struct Components { @@ -47,12 +47,12 @@ private: virtual DispatchEventOfSameName handle_mouseup(Badge, CSSPixelPoint, unsigned button, unsigned modifiers) override; virtual DispatchEventOfSameName handle_mousemove(Badge, CSSPixelPoint, unsigned buttons, unsigned modifiers) override; - Components compute_control_bar_components(PaintContext&, HTML::HTMLMediaElement const&, DevicePixelRect media_rect) const; - static void paint_control_bar_playback_button(PaintContext&, HTML::HTMLMediaElement const&, Components const&, Optional const& mouse_position); - static void paint_control_bar_timeline(PaintContext&, HTML::HTMLMediaElement const&, Components const&); - static void paint_control_bar_timestamp(PaintContext&, Components const&); - static void paint_control_bar_speaker(PaintContext&, HTML::HTMLMediaElement const&, Components const& components, Optional const& mouse_position); - static void paint_control_bar_volume(PaintContext&, HTML::HTMLMediaElement const&, Components const&, Optional const& mouse_position); + Components compute_control_bar_components(DisplayListRecordingContext&, HTML::HTMLMediaElement const&, DevicePixelRect media_rect) const; + static void paint_control_bar_playback_button(DisplayListRecordingContext&, HTML::HTMLMediaElement const&, Components const&, Optional const& mouse_position); + static void paint_control_bar_timeline(DisplayListRecordingContext&, HTML::HTMLMediaElement const&, Components const&); + static void paint_control_bar_timestamp(DisplayListRecordingContext&, Components const&); + static void paint_control_bar_speaker(DisplayListRecordingContext&, HTML::HTMLMediaElement const&, Components const& components, Optional const& mouse_position); + static void paint_control_bar_volume(DisplayListRecordingContext&, HTML::HTMLMediaElement const&, Components const&, Optional const& mouse_position); enum class Temporary { Yes, diff --git a/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp index bb087cc28de..53e2f0a2f8b 100644 --- a/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp +++ b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.cpp @@ -33,7 +33,7 @@ Layout::NavigableContainerViewport const& NavigableContainerViewportPaintable::l return static_cast(layout_node()); } -void NavigableContainerViewportPaintable::paint(PaintContext& context, PaintPhase phase) const +void NavigableContainerViewportPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h index ccc6d24881b..d21ed734491 100644 --- a/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h +++ b/Libraries/LibWeb/Painting/NavigableContainerViewportPaintable.h @@ -20,7 +20,7 @@ public: static GC::Ref create(Layout::NavigableContainerViewport const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::NavigableContainerViewport const& layout_box() const; diff --git a/Libraries/LibWeb/Painting/Paintable.h b/Libraries/LibWeb/Painting/Paintable.h index 810e58d9ba5..7a8276d03c9 100644 --- a/Libraries/LibWeb/Painting/Paintable.h +++ b/Libraries/LibWeb/Painting/Paintable.h @@ -70,10 +70,10 @@ public: bool has_stacking_context() const; StackingContext* enclosing_stacking_context(); - virtual void before_paint(PaintContext&, PaintPhase) const { } - virtual void after_paint(PaintContext&, PaintPhase) const { } + virtual void before_paint(DisplayListRecordingContext&, PaintPhase) const { } + virtual void after_paint(DisplayListRecordingContext&, PaintPhase) const { } - virtual void paint(PaintContext&, PaintPhase) const { } + virtual void paint(DisplayListRecordingContext&, PaintPhase) const { } [[nodiscard]] virtual TraversalDecision hit_test(CSSPixelPoint, HitTestType, Function const& callback) const; diff --git a/Libraries/LibWeb/Painting/PaintableBox.cpp b/Libraries/LibWeb/Painting/PaintableBox.cpp index 42e7e25c8c1..c4bd01937ec 100644 --- a/Libraries/LibWeb/Painting/PaintableBox.cpp +++ b/Libraries/LibWeb/Painting/PaintableBox.cpp @@ -321,7 +321,7 @@ bool PaintableBox::wants_mouse_events() const return false; } -void PaintableBox::before_paint(PaintContext& context, PaintPhase phase) const +void PaintableBox::before_paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; @@ -334,7 +334,7 @@ void PaintableBox::before_paint(PaintContext& context, PaintPhase phase) const apply_scroll_offset(context); } -void PaintableBox::after_paint(PaintContext& context, PaintPhase phase) const +void PaintableBox::after_paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; @@ -432,7 +432,7 @@ Optional PaintableBox::compute_scrollbar_data(Scrol return scrollbar_data; } -void PaintableBox::paint(PaintContext& context, PaintPhase phase) const +void PaintableBox::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; @@ -563,7 +563,7 @@ BordersData PaintableBox::remove_element_kind_from_borders_data(PaintableBox::Bo }; } -void PaintableBox::paint_border(PaintContext& context) const +void PaintableBox::paint_border(DisplayListRecordingContext& context) const { auto borders_data = m_override_borders_data.has_value() ? remove_element_kind_from_borders_data(m_override_borders_data.value()) : BordersData { .top = box_model().border.top == 0 ? CSS::BorderData() : computed_values().border_top(), @@ -574,7 +574,7 @@ void PaintableBox::paint_border(PaintContext& context) const paint_all_borders(context.display_list_recorder(), context.rounded_device_rect(absolute_border_box_rect()), normalized_border_radii_data().as_corners(context.device_pixel_converter()), borders_data.to_device_pixels(context)); } -void PaintableBox::paint_backdrop_filter(PaintContext& context) const +void PaintableBox::paint_backdrop_filter(DisplayListRecordingContext& context) const { auto const& backdrop_filter = computed_values().backdrop_filter(); if (!backdrop_filter.has_value()) { @@ -587,7 +587,7 @@ void PaintableBox::paint_backdrop_filter(PaintContext& context) const context.display_list_recorder().apply_backdrop_filter(backdrop_region.to_type(), border_radii_data, backdrop_filter.value()); } -void PaintableBox::paint_background(PaintContext& context) const +void PaintableBox::paint_background(DisplayListRecordingContext& context) const { // If the body's background properties were propagated to the root element, do no re-paint the body's background. if (layout_node_with_style_and_box_metrics().is_body() && document().html_element()->should_use_body_background_properties()) @@ -596,7 +596,7 @@ void PaintableBox::paint_background(PaintContext& context) const Painting::paint_background(context, *this, computed_values().image_rendering(), m_resolved_background, normalized_border_radii_data()); } -void PaintableBox::paint_box_shadow(PaintContext& context) const +void PaintableBox::paint_box_shadow(DisplayListRecordingContext& context) const { auto const& resolved_box_shadow_data = box_shadow_data(); if (resolved_box_shadow_data.is_empty()) @@ -647,21 +647,21 @@ Optional PaintableBox::clip_rect_for_hit_testing() const return {}; } -void PaintableBox::apply_scroll_offset(PaintContext& context) const +void PaintableBox::apply_scroll_offset(DisplayListRecordingContext& context) const { if (scroll_frame_id().has_value()) { context.display_list_recorder().push_scroll_frame_id(scroll_frame_id().value()); } } -void PaintableBox::reset_scroll_offset(PaintContext& context) const +void PaintableBox::reset_scroll_offset(DisplayListRecordingContext& context) const { if (scroll_frame_id().has_value()) { context.display_list_recorder().pop_scroll_frame_id(); } } -void PaintableBox::apply_clip_overflow_rect(PaintContext& context, PaintPhase phase) const +void PaintableBox::apply_clip_overflow_rect(DisplayListRecordingContext& context, PaintPhase phase) const { if (!enclosing_clip_frame()) return; @@ -672,7 +672,7 @@ void PaintableBox::apply_clip_overflow_rect(PaintContext& context, PaintPhase ph context.display_list_recorder().push_clip_frame(enclosing_clip_frame()); } -void PaintableBox::clear_clip_overflow_rect(PaintContext& context, PaintPhase phase) const +void PaintableBox::clear_clip_overflow_rect(DisplayListRecordingContext& context, PaintPhase phase) const { if (!enclosing_clip_frame()) return; @@ -683,7 +683,7 @@ void PaintableBox::clear_clip_overflow_rect(PaintContext& context, PaintPhase ph context.display_list_recorder().pop_clip_frame(); } -void paint_cursor_if_needed(PaintContext& context, TextPaintable const& paintable, PaintableFragment const& fragment) +void paint_cursor_if_needed(DisplayListRecordingContext& context, TextPaintable const& paintable, PaintableFragment const& fragment) { auto const& navigable = *paintable.navigable(); auto const& document = paintable.document(); @@ -734,7 +734,7 @@ void paint_cursor_if_needed(PaintContext& context, TextPaintable const& paintabl context.display_list_recorder().fill_rect(cursor_device_rect, caret_color); } -void paint_text_decoration(PaintContext& context, TextPaintable const& paintable, PaintableFragment const& fragment) +void paint_text_decoration(DisplayListRecordingContext& context, TextPaintable const& paintable, PaintableFragment const& fragment) { auto& painter = context.display_list_recorder(); auto& font = fragment.layout_node().first_available_font(); @@ -847,7 +847,7 @@ void paint_text_decoration(PaintContext& context, TextPaintable const& paintable } } -void paint_text_fragment(PaintContext& context, TextPaintable const& paintable, PaintableFragment const& fragment, PaintPhase phase) +void paint_text_fragment(DisplayListRecordingContext& context, TextPaintable const& paintable, PaintableFragment const& fragment, PaintPhase phase) { if (!paintable.is_visible()) return; @@ -885,7 +885,7 @@ void paint_text_fragment(PaintContext& context, TextPaintable const& paintable, } } -void PaintableWithLines::paint(PaintContext& context, PaintPhase phase) const +void PaintableWithLines::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/PaintableBox.h b/Libraries/LibWeb/Painting/PaintableBox.h index 51e7e7072fc..8fe69915f2a 100644 --- a/Libraries/LibWeb/Painting/PaintableBox.h +++ b/Libraries/LibWeb/Painting/PaintableBox.h @@ -32,10 +32,10 @@ public: static GC::Ref create(Layout::InlineNode const&); virtual ~PaintableBox(); - virtual void before_paint(PaintContext&, PaintPhase) const override; - virtual void after_paint(PaintContext&, PaintPhase) const override; + virtual void before_paint(DisplayListRecordingContext&, PaintPhase) const override; + virtual void after_paint(DisplayListRecordingContext&, PaintPhase) const override; - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; StackingContext* stacking_context() { return m_stacking_context; } StackingContext const* stacking_context() const { return m_stacking_context; } @@ -44,7 +44,7 @@ public: virtual Optional get_masking_area() const; virtual Optional get_mask_type() const { return {}; } - virtual RefPtr calculate_mask(PaintContext&, CSSPixelRect const&) const { return {}; } + virtual RefPtr calculate_mask(DisplayListRecordingContext&, CSSPixelRect const&) const { return {}; } Layout::NodeWithStyleAndBoxModelMetrics& layout_node_with_style_and_box_metrics() { return static_cast(Paintable::layout_node()); } Layout::NodeWithStyleAndBoxModelMetrics const& layout_node_with_style_and_box_metrics() const { return static_cast(Paintable::layout_node()); } @@ -134,11 +134,11 @@ public: virtual void set_needs_display(InvalidateDisplayList = InvalidateDisplayList::Yes) override; - void apply_scroll_offset(PaintContext&) const; - void reset_scroll_offset(PaintContext&) const; + void apply_scroll_offset(DisplayListRecordingContext&) const; + void reset_scroll_offset(DisplayListRecordingContext&) const; - void apply_clip_overflow_rect(PaintContext&, PaintPhase) const; - void clear_clip_overflow_rect(PaintContext&, PaintPhase) const; + void apply_clip_overflow_rect(DisplayListRecordingContext&, PaintPhase) const; + void clear_clip_overflow_rect(DisplayListRecordingContext&, PaintPhase) const; [[nodiscard]] virtual TraversalDecision hit_test(CSSPixelPoint position, HitTestType type, Function const& callback) const override; Optional hit_test(CSSPixelPoint, HitTestType) const; @@ -265,10 +265,10 @@ protected: explicit PaintableBox(Layout::Box const&); explicit PaintableBox(Layout::InlineNode const&); - virtual void paint_border(PaintContext&) const; - virtual void paint_backdrop_filter(PaintContext&) const; - virtual void paint_background(PaintContext&) const; - virtual void paint_box_shadow(PaintContext&) const; + virtual void paint_border(DisplayListRecordingContext&) const; + virtual void paint_backdrop_filter(DisplayListRecordingContext&) const; + virtual void paint_background(DisplayListRecordingContext&) const; + virtual void paint_box_shadow(DisplayListRecordingContext&) const; virtual CSSPixelRect compute_absolute_rect() const; virtual CSSPixelRect compute_absolute_paint_rect() const; @@ -379,7 +379,7 @@ public: } } - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; [[nodiscard]] virtual TraversalDecision hit_test(CSSPixelPoint position, HitTestType type, Function const& callback) const override; @@ -406,8 +406,8 @@ private: size_t m_line_index { 0 }; }; -void paint_text_decoration(PaintContext&, TextPaintable const&, PaintableFragment const&); -void paint_cursor_if_needed(PaintContext&, TextPaintable const&, PaintableFragment const&); -void paint_text_fragment(PaintContext&, TextPaintable const&, PaintableFragment const&, PaintPhase); +void paint_text_decoration(DisplayListRecordingContext&, TextPaintable const&, PaintableFragment const&); +void paint_cursor_if_needed(DisplayListRecordingContext&, TextPaintable const&, PaintableFragment const&); +void paint_text_fragment(DisplayListRecordingContext&, TextPaintable const&, PaintableFragment const&, PaintPhase); } diff --git a/Libraries/LibWeb/Painting/RadioButtonPaintable.cpp b/Libraries/LibWeb/Painting/RadioButtonPaintable.cpp index 9a6cd727e10..16b0199549b 100644 --- a/Libraries/LibWeb/Painting/RadioButtonPaintable.cpp +++ b/Libraries/LibWeb/Painting/RadioButtonPaintable.cpp @@ -28,7 +28,7 @@ RadioButtonPaintable::RadioButtonPaintable(Layout::RadioButton const& layout_box { } -void RadioButtonPaintable::paint(PaintContext& context, PaintPhase phase) const +void RadioButtonPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/RadioButtonPaintable.h b/Libraries/LibWeb/Painting/RadioButtonPaintable.h index ffba3107dcf..7f7636480aa 100644 --- a/Libraries/LibWeb/Painting/RadioButtonPaintable.h +++ b/Libraries/LibWeb/Painting/RadioButtonPaintable.h @@ -18,7 +18,7 @@ class RadioButtonPaintable final : public LabelablePaintable { public: static GC::Ref create(Layout::RadioButton const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; private: RadioButtonPaintable(Layout::RadioButton const&); diff --git a/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.cpp b/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.cpp index ea0fadf5a69..ae0cb53dbdf 100644 --- a/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.cpp +++ b/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.cpp @@ -31,7 +31,7 @@ TraversalDecision SVGForeignObjectPaintable::hit_test(CSSPixelPoint position, Hi return PaintableWithLines::hit_test(position, type, callback); } -void SVGForeignObjectPaintable::paint(PaintContext& context, PaintPhase phase) const +void SVGForeignObjectPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; diff --git a/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.h b/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.h index c31def46430..89415d370ab 100644 --- a/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.h +++ b/Libraries/LibWeb/Painting/SVGForeignObjectPaintable.h @@ -23,14 +23,14 @@ public: virtual TraversalDecision hit_test(CSSPixelPoint, HitTestType, Function const& callback) const override; - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::SVGForeignObjectBox const& layout_box() const; virtual GC::Ptr dom_node_of_svg() const override { return dom_node(); } virtual Optional get_masking_area() const override { return get_masking_area_of_svg(); } virtual Optional get_mask_type() const override { return get_mask_type_of_svg(); } - virtual RefPtr calculate_mask(PaintContext& paint_context, CSSPixelRect const& masking_area) const override { return calculate_mask_of_svg(paint_context, masking_area); } + virtual RefPtr calculate_mask(DisplayListRecordingContext& paint_context, CSSPixelRect const& masking_area) const override { return calculate_mask_of_svg(paint_context, masking_area); } protected: SVGForeignObjectPaintable(Layout::SVGForeignObjectBox const&); diff --git a/Libraries/LibWeb/Painting/SVGGraphicsPaintable.h b/Libraries/LibWeb/Painting/SVGGraphicsPaintable.h index b6e6031100f..9ac8f7f0f99 100644 --- a/Libraries/LibWeb/Painting/SVGGraphicsPaintable.h +++ b/Libraries/LibWeb/Painting/SVGGraphicsPaintable.h @@ -37,7 +37,7 @@ public: return Gfx::AffineTransform {}.multiply(svg_to_viewbox_transform()).multiply(additional_svg_transform.value_or(Gfx::AffineTransform {})).multiply(svg_transform()); } - Gfx::AffineTransform svg_to_device_pixels_transform(PaintContext const& context) const + Gfx::AffineTransform svg_to_device_pixels_transform(DisplayListRecordingContext const& context) const { auto css_scale = context.device_pixels_per_css_pixel(); return Gfx::AffineTransform {}.scale({ css_scale, css_scale }).multiply(svg_to_css_pixels_transform(context.svg_transform())); @@ -55,7 +55,7 @@ public: virtual GC::Ptr dom_node_of_svg() const override { return dom_node(); } virtual Optional get_masking_area() const override { return get_masking_area_of_svg(); } virtual Optional get_mask_type() const override { return get_mask_type_of_svg(); } - virtual RefPtr calculate_mask(PaintContext& paint_context, CSSPixelRect const& masking_area) const override { return calculate_mask_of_svg(paint_context, masking_area); } + virtual RefPtr calculate_mask(DisplayListRecordingContext& paint_context, CSSPixelRect const& masking_area) const override { return calculate_mask_of_svg(paint_context, masking_area); } void set_computed_transforms(ComputedTransforms computed_transforms) { diff --git a/Libraries/LibWeb/Painting/SVGMaskable.cpp b/Libraries/LibWeb/Painting/SVGMaskable.cpp index 00cbf633872..87c5eb5e683 100644 --- a/Libraries/LibWeb/Painting/SVGMaskable.cpp +++ b/Libraries/LibWeb/Painting/SVGMaskable.cpp @@ -73,7 +73,7 @@ Optional SVGMaskable::get_mask_type_of_svg() const return {}; } -RefPtr SVGMaskable::calculate_mask_of_svg(PaintContext& context, CSSPixelRect const& masking_area) const +RefPtr SVGMaskable::calculate_mask_of_svg(DisplayListRecordingContext& context, CSSPixelRect const& masking_area) const { auto const& graphics_element = as(*dom_node_of_svg()); auto mask_rect = context.enclosing_device_rect(masking_area); diff --git a/Libraries/LibWeb/Painting/SVGMaskable.h b/Libraries/LibWeb/Painting/SVGMaskable.h index ed69616503e..537cafb5c4b 100644 --- a/Libraries/LibWeb/Painting/SVGMaskable.h +++ b/Libraries/LibWeb/Painting/SVGMaskable.h @@ -4,7 +4,6 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include #pragma once @@ -19,7 +18,7 @@ public: Optional get_masking_area_of_svg() const; Optional get_mask_type_of_svg() const; - RefPtr calculate_mask_of_svg(PaintContext&, CSSPixelRect const& masking_area) const; + RefPtr calculate_mask_of_svg(DisplayListRecordingContext&, CSSPixelRect const& masking_area) const; }; } diff --git a/Libraries/LibWeb/Painting/SVGPathPaintable.cpp b/Libraries/LibWeb/Painting/SVGPathPaintable.cpp index 500d002d628..c5dfaae17cf 100644 --- a/Libraries/LibWeb/Painting/SVGPathPaintable.cpp +++ b/Libraries/LibWeb/Painting/SVGPathPaintable.cpp @@ -51,7 +51,7 @@ static Gfx::WindingRule to_gfx_winding_rule(SVG::FillRule fill_rule) } } -void SVGPathPaintable::paint(PaintContext& context, PaintPhase phase) const +void SVGPathPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible() || !computed_path().has_value()) return; diff --git a/Libraries/LibWeb/Painting/SVGPathPaintable.h b/Libraries/LibWeb/Painting/SVGPathPaintable.h index d5f9679c41e..b779a83bdd0 100644 --- a/Libraries/LibWeb/Painting/SVGPathPaintable.h +++ b/Libraries/LibWeb/Painting/SVGPathPaintable.h @@ -21,7 +21,7 @@ public: virtual TraversalDecision hit_test(CSSPixelPoint, HitTestType, Function const& callback) const override; - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::SVGGraphicsBox const& layout_box() const; diff --git a/Libraries/LibWeb/Painting/SVGSVGPaintable.cpp b/Libraries/LibWeb/Painting/SVGSVGPaintable.cpp index 7e7e0ebcd94..b9c16adbf5d 100644 --- a/Libraries/LibWeb/Painting/SVGSVGPaintable.cpp +++ b/Libraries/LibWeb/Painting/SVGSVGPaintable.cpp @@ -37,7 +37,7 @@ static Gfx::FloatMatrix4x4 matrix_with_scaled_translation(Gfx::FloatMatrix4x4 ma return matrix; } -void SVGSVGPaintable::paint_svg_box(PaintContext& context, PaintableBox const& svg_box, PaintPhase phase) +void SVGSVGPaintable::paint_svg_box(DisplayListRecordingContext& context, PaintableBox const& svg_box, PaintPhase phase) { auto const& computed_values = svg_box.computed_values(); @@ -107,7 +107,7 @@ void SVGSVGPaintable::paint_svg_box(PaintContext& context, PaintableBox const& s } } -void SVGSVGPaintable::paint_descendants(PaintContext& context, PaintableBox const& paintable, PaintPhase phase) +void SVGSVGPaintable::paint_descendants(DisplayListRecordingContext& context, PaintableBox const& paintable, PaintPhase phase) { if (phase != PaintPhase::Foreground) return; diff --git a/Libraries/LibWeb/Painting/SVGSVGPaintable.h b/Libraries/LibWeb/Painting/SVGSVGPaintable.h index 7a37c971d86..1573e9d41d5 100644 --- a/Libraries/LibWeb/Painting/SVGSVGPaintable.h +++ b/Libraries/LibWeb/Painting/SVGSVGPaintable.h @@ -20,8 +20,8 @@ public: Layout::SVGSVGBox const& layout_box() const; - static void paint_svg_box(PaintContext& context, PaintableBox const& svg_box, PaintPhase phase); - static void paint_descendants(PaintContext& context, PaintableBox const& paintable, PaintPhase phase); + static void paint_svg_box(DisplayListRecordingContext& context, PaintableBox const& svg_box, PaintPhase phase); + static void paint_descendants(DisplayListRecordingContext& context, PaintableBox const& paintable, PaintPhase phase); protected: SVGSVGPaintable(Layout::SVGSVGBox const&); diff --git a/Libraries/LibWeb/Painting/ShadowPainting.cpp b/Libraries/LibWeb/Painting/ShadowPainting.cpp index 18e2604d3b6..b265d475a92 100644 --- a/Libraries/LibWeb/Painting/ShadowPainting.cpp +++ b/Libraries/LibWeb/Painting/ShadowPainting.cpp @@ -9,14 +9,14 @@ #include #include #include +#include #include -#include #include #include namespace Web::Painting { -void paint_box_shadow(PaintContext& context, +void paint_box_shadow(DisplayListRecordingContext& context, CSSPixelRect const& bordered_content_rect, CSSPixelRect const& borderless_content_rect, BordersData const& borders_data, @@ -64,7 +64,7 @@ void paint_box_shadow(PaintContext& context, } } -void paint_text_shadow(PaintContext& context, PaintableFragment const& fragment, Vector const& shadow_layers) +void paint_text_shadow(DisplayListRecordingContext& context, PaintableFragment const& fragment, Vector const& shadow_layers) { if (shadow_layers.is_empty()) return; diff --git a/Libraries/LibWeb/Painting/ShadowPainting.h b/Libraries/LibWeb/Painting/ShadowPainting.h index b9f8452e71f..d68cc85a485 100644 --- a/Libraries/LibWeb/Painting/ShadowPainting.h +++ b/Libraries/LibWeb/Painting/ShadowPainting.h @@ -8,20 +8,20 @@ #include #include +#include #include -#include #include #include namespace Web::Painting { void paint_box_shadow( - PaintContext&, + DisplayListRecordingContext&, CSSPixelRect const& bordered_content_rect, CSSPixelRect const& borderless_content_rect, BordersData const& borders_data, BorderRadiiData const&, Vector const&); -void paint_text_shadow(PaintContext&, PaintableFragment const&, Vector const&); +void paint_text_shadow(DisplayListRecordingContext&, PaintableFragment const&, Vector const&); } diff --git a/Libraries/LibWeb/Painting/StackingContext.cpp b/Libraries/LibWeb/Painting/StackingContext.cpp index 342d72dd3e7..6915f905b6a 100644 --- a/Libraries/LibWeb/Painting/StackingContext.cpp +++ b/Libraries/LibWeb/Painting/StackingContext.cpp @@ -24,7 +24,7 @@ namespace Web::Painting { -static void paint_node(Paintable const& paintable, PaintContext& context, PaintPhase phase) +static void paint_node(Paintable const& paintable, DisplayListRecordingContext& context, PaintPhase phase) { TemporaryChange save_nesting_level(context.display_list_recorder().m_save_nesting_level, 0); @@ -84,7 +84,7 @@ static PaintPhase to_paint_phase(StackingContext::StackingContextPaintPhase phas } } -void StackingContext::paint_node_as_stacking_context(Paintable const& paintable, PaintContext& context) +void StackingContext::paint_node_as_stacking_context(Paintable const& paintable, DisplayListRecordingContext& context) { if (paintable.layout_node().is_svg_svg_box()) { paint_svg(context, static_cast(paintable), PaintPhase::Foreground); @@ -103,7 +103,7 @@ void StackingContext::paint_node_as_stacking_context(Paintable const& paintable, paint_descendants(context, paintable, StackingContextPaintPhase::FocusAndOverlay); } -void StackingContext::paint_svg(PaintContext& context, PaintableBox const& paintable, PaintPhase phase) +void StackingContext::paint_svg(DisplayListRecordingContext& context, PaintableBox const& paintable, PaintPhase phase) { if (phase != PaintPhase::Foreground) return; @@ -115,7 +115,7 @@ void StackingContext::paint_svg(PaintContext& context, PaintableBox const& paint paintable.after_paint(context, PaintPhase::Foreground); } -void StackingContext::paint_descendants(PaintContext& context, Paintable const& paintable, StackingContextPaintPhase phase) +void StackingContext::paint_descendants(DisplayListRecordingContext& context, Paintable const& paintable, StackingContextPaintPhase phase) { paintable.for_each_child([&context, phase](auto& child) { if (child.has_stacking_context()) @@ -196,14 +196,14 @@ void StackingContext::paint_descendants(PaintContext& context, Paintable const& }); } -void StackingContext::paint_child(PaintContext& context, StackingContext const& child) +void StackingContext::paint_child(DisplayListRecordingContext& context, StackingContext const& child) { VERIFY(!child.paintable_box().layout_node().is_svg_box()); const_cast(child).set_last_paint_generation_id(context.paint_generation_id()); child.paint(context); } -void StackingContext::paint_internal(PaintContext& context) const +void StackingContext::paint_internal(DisplayListRecordingContext& context) const { VERIFY(!paintable_box().layout_node().is_svg_box()); if (paintable_box().layout_node().is_svg_svg_box()) { @@ -299,7 +299,7 @@ static Gfx::FloatMatrix4x4 matrix_with_scaled_translation(Gfx::FloatMatrix4x4 ma return matrix; } -void StackingContext::paint(PaintContext& context) const +void StackingContext::paint(DisplayListRecordingContext& context) const { auto opacity = paintable_box().computed_values().opacity(); if (opacity == 0.0f) diff --git a/Libraries/LibWeb/Painting/StackingContext.h b/Libraries/LibWeb/Painting/StackingContext.h index 1d668133d71..1ca87385c2e 100644 --- a/Libraries/LibWeb/Painting/StackingContext.h +++ b/Libraries/LibWeb/Painting/StackingContext.h @@ -31,10 +31,10 @@ public: FocusAndOverlay, }; - static void paint_node_as_stacking_context(Paintable const&, PaintContext&); - static void paint_descendants(PaintContext&, Paintable const&, StackingContextPaintPhase); - static void paint_svg(PaintContext&, PaintableBox const&, PaintPhase); - void paint(PaintContext&) const; + static void paint_node_as_stacking_context(Paintable const&, DisplayListRecordingContext&); + static void paint_descendants(DisplayListRecordingContext&, Paintable const&, StackingContextPaintPhase); + static void paint_svg(DisplayListRecordingContext&, PaintableBox const&, PaintPhase); + void paint(DisplayListRecordingContext&) const; [[nodiscard]] TraversalDecision hit_test(CSSPixelPoint, HitTestType, Function const& callback) const; @@ -56,8 +56,8 @@ private: Vector> m_positioned_descendants_and_stacking_contexts_with_stack_level_0; Vector> m_non_positioned_floating_descendants; - static void paint_child(PaintContext&, StackingContext const&); - void paint_internal(PaintContext&) const; + static void paint_child(DisplayListRecordingContext&, StackingContext const&); + void paint_internal(DisplayListRecordingContext&) const; }; } diff --git a/Libraries/LibWeb/Painting/TableBordersPainting.cpp b/Libraries/LibWeb/Painting/TableBordersPainting.cpp index 6e24225473a..1e1064b51f4 100644 --- a/Libraries/LibWeb/Painting/TableBordersPainting.cpp +++ b/Libraries/LibWeb/Painting/TableBordersPainting.cpp @@ -243,7 +243,7 @@ static CSS::BorderData css_border_data_from_device_border_data(DeviceBorderData }; } -static void paint_collected_edges(PaintContext& context, Vector& border_edge_painting_info_list) +static void paint_collected_edges(DisplayListRecordingContext& context, Vector& border_edge_painting_info_list) { // This sorting step isn't part of the specification, but it matches the behavior of other browsers at border intersections, which aren't // part of border conflict resolution in the specification but it's still desirable to handle them in a way which is consistent with it. @@ -297,7 +297,7 @@ static void paint_collected_edges(PaintContext& context, Vector snap_cells_to_device_coordinates(HashMap const& cell_coordinates_to_box, size_t row_count, size_t column_count, PaintContext const& context) +static HashMap snap_cells_to_device_coordinates(HashMap const& cell_coordinates_to_box, size_t row_count, size_t column_count, DisplayListRecordingContext const& context) { Vector y_line_start_coordinates; Vector y_line_end_coordinates; @@ -333,7 +333,7 @@ static HashMap snap_cells_to_device_coordinate return cell_coordinates_to_device_rect; } -static DeviceBorderDataWithElementKind device_border_data_from_css_border_data(Painting::PaintableBox::BorderDataWithElementKind const& border_data_with_element_kind, PaintContext const& context) +static DeviceBorderDataWithElementKind device_border_data_from_css_border_data(Painting::PaintableBox::BorderDataWithElementKind const& border_data_with_element_kind, DisplayListRecordingContext const& context) { return DeviceBorderDataWithElementKind { .border_data = { @@ -345,7 +345,7 @@ static DeviceBorderDataWithElementKind device_border_data_from_css_border_data(P }; } -static void paint_separate_cell_borders(PaintableBox const& cell_box, HashMap const& cell_coordinates_to_device_rect, PaintContext& context) +static void paint_separate_cell_borders(PaintableBox const& cell_box, HashMap const& cell_coordinates_to_device_rect, DisplayListRecordingContext& context) { auto borders_data = cell_box.override_borders_data().has_value() ? PaintableBox::remove_element_kind_from_borders_data(cell_box.override_borders_data().value()) : BordersData { .top = cell_box.box_model().border.top == 0 ? CSS::BorderData() : cell_box.computed_values().border_top(), @@ -357,7 +357,7 @@ static void paint_separate_cell_borders(PaintableBox const& cell_box, HashMap - namespace Web::Painting { -void paint_table_borders(PaintContext&, PaintableBox const& table_paintable); +void paint_table_borders(DisplayListRecordingContext&, PaintableBox const& table_paintable); } diff --git a/Libraries/LibWeb/Painting/VideoPaintable.cpp b/Libraries/LibWeb/Painting/VideoPaintable.cpp index e2f5deb31c1..66f96fb7782 100644 --- a/Libraries/LibWeb/Painting/VideoPaintable.cpp +++ b/Libraries/LibWeb/Painting/VideoPaintable.cpp @@ -48,7 +48,7 @@ Layout::VideoBox const& VideoPaintable::layout_box() const return static_cast(layout_node()); } -void VideoPaintable::paint(PaintContext& context, PaintPhase phase) const +void VideoPaintable::paint(DisplayListRecordingContext& context, PaintPhase phase) const { if (!is_visible()) return; @@ -179,7 +179,7 @@ void VideoPaintable::paint(PaintContext& context, PaintPhase phase) const } } -void VideoPaintable::paint_placeholder_video_controls(PaintContext& context, DevicePixelRect video_rect, Optional const& mouse_position) const +void VideoPaintable::paint_placeholder_video_controls(DisplayListRecordingContext& context, DevicePixelRect video_rect, Optional const& mouse_position) const { auto maximum_control_box_size = context.rounded_device_pixels(100); auto maximum_playback_button_size = context.rounded_device_pixels(40); diff --git a/Libraries/LibWeb/Painting/VideoPaintable.h b/Libraries/LibWeb/Painting/VideoPaintable.h index 73f0b21ec42..47ab278da0b 100644 --- a/Libraries/LibWeb/Painting/VideoPaintable.h +++ b/Libraries/LibWeb/Painting/VideoPaintable.h @@ -18,7 +18,7 @@ class VideoPaintable final : public MediaPaintable { public: static GC::Ref create(Layout::VideoBox const&); - virtual void paint(PaintContext&, PaintPhase) const override; + virtual void paint(DisplayListRecordingContext&, PaintPhase) const override; Layout::VideoBox& layout_box(); Layout::VideoBox const& layout_box() const; @@ -26,7 +26,7 @@ public: private: VideoPaintable(Layout::VideoBox const&); - void paint_placeholder_video_controls(PaintContext&, DevicePixelRect video_rect, Optional const& mouse_position) const; + void paint_placeholder_video_controls(DisplayListRecordingContext&, DevicePixelRect video_rect, Optional const& mouse_position) const; }; } diff --git a/Libraries/LibWeb/Painting/ViewportPaintable.cpp b/Libraries/LibWeb/Painting/ViewportPaintable.cpp index 55b48afc6a7..38f144da67f 100644 --- a/Libraries/LibWeb/Painting/ViewportPaintable.cpp +++ b/Libraries/LibWeb/Painting/ViewportPaintable.cpp @@ -61,7 +61,7 @@ void ViewportPaintable::build_stacking_context_tree() stacking_context()->sort(); } -void ViewportPaintable::paint_all_phases(PaintContext& context) +void ViewportPaintable::paint_all_phases(DisplayListRecordingContext& context) { build_stacking_context_tree_if_needed(); context.display_list_recorder().save_layer(); diff --git a/Libraries/LibWeb/Painting/ViewportPaintable.h b/Libraries/LibWeb/Painting/ViewportPaintable.h index 424f8edff24..dcbf2ced34c 100644 --- a/Libraries/LibWeb/Painting/ViewportPaintable.h +++ b/Libraries/LibWeb/Painting/ViewportPaintable.h @@ -20,7 +20,7 @@ public: static GC::Ref create(Layout::Viewport const&); virtual ~ViewportPaintable() override; - void paint_all_phases(PaintContext&); + void paint_all_phases(DisplayListRecordingContext&); void build_stacking_context_tree_if_needed(); void assign_scroll_frames(); diff --git a/Libraries/LibWeb/SVG/SVGDecodedImageData.cpp b/Libraries/LibWeb/SVG/SVGDecodedImageData.cpp index a3c9e53ea62..b5b0b752790 100644 --- a/Libraries/LibWeb/SVG/SVGDecodedImageData.cpp +++ b/Libraries/LibWeb/SVG/SVGDecodedImageData.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include