diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 6b67d82c057..95478a39f99 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -725,8 +725,8 @@ set(SOURCES Painting/CanvasPaintable.cpp Painting/CheckBoxPaintable.cpp Painting/ClipFrame.cpp - Painting/Command.cpp Painting/DisplayList.cpp + Painting/DisplayListCommand.cpp Painting/DisplayListPlayerSkia.cpp Painting/DisplayListRecorder.cpp Painting/DisplayListRecordingContext.cpp diff --git a/Libraries/LibWeb/Painting/DisplayList.cpp b/Libraries/LibWeb/Painting/DisplayList.cpp index 0dabcc0080c..f0664151df0 100644 --- a/Libraries/LibWeb/Painting/DisplayList.cpp +++ b/Libraries/LibWeb/Painting/DisplayList.cpp @@ -10,7 +10,7 @@ namespace Web::Painting { -void DisplayList::append(Command&& command, Optional scroll_frame_id, RefPtr clip_frame) +void DisplayList::append(DisplayListCommand&& command, Optional scroll_frame_id, RefPtr clip_frame) { m_commands.append({ scroll_frame_id, clip_frame, move(command) }); } @@ -25,7 +25,7 @@ String DisplayList::dump() const return builder.to_string_without_validation(); } -static Optional command_bounding_rectangle(Command const& command) +static Optional command_bounding_rectangle(DisplayListCommand const& command) { return command.visit( [&](auto const& command) -> Optional { @@ -36,7 +36,7 @@ static Optional command_bounding_rectangle(Command const& command) }); } -static bool command_is_clip_or_mask(Command const& command) +static bool command_is_clip_or_mask(DisplayListCommand const& command) { return command.visit( [&](auto const& command) -> bool { diff --git a/Libraries/LibWeb/Painting/DisplayList.h b/Libraries/LibWeb/Painting/DisplayList.h index 0d5a112684f..d15287c39d8 100644 --- a/Libraries/LibWeb/Painting/DisplayList.h +++ b/Libraries/LibWeb/Painting/DisplayList.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include namespace Web::Painting { @@ -89,15 +89,15 @@ public: return adopt_ref(*new DisplayList(device_pixels_per_css_pixel)); } - void append(Command&& command, Optional scroll_frame_id, RefPtr); + void append(DisplayListCommand&& command, Optional scroll_frame_id, RefPtr); - struct CommandListItem { + struct DisplayListCommandWithScrollAndClip { Optional scroll_frame_id; RefPtr clip_frame; - Command command; + DisplayListCommand command; }; - AK::SegmentedVector const& commands() const { return m_commands; } + AK::SegmentedVector const& commands() const { return m_commands; } double device_pixels_per_css_pixel() const { return m_device_pixels_per_css_pixel; } String dump() const; @@ -108,7 +108,7 @@ private: { } - AK::SegmentedVector m_commands; + AK::SegmentedVector m_commands; double m_device_pixels_per_css_pixel; }; diff --git a/Libraries/LibWeb/Painting/Command.cpp b/Libraries/LibWeb/Painting/DisplayListCommand.cpp similarity index 99% rename from Libraries/LibWeb/Painting/Command.cpp rename to Libraries/LibWeb/Painting/DisplayListCommand.cpp index fd3331ad453..9973116a719 100644 --- a/Libraries/LibWeb/Painting/Command.cpp +++ b/Libraries/LibWeb/Painting/DisplayListCommand.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include namespace Web::Painting { diff --git a/Libraries/LibWeb/Painting/Command.h b/Libraries/LibWeb/Painting/DisplayListCommand.h similarity index 99% rename from Libraries/LibWeb/Painting/Command.h rename to Libraries/LibWeb/Painting/DisplayListCommand.h index 2a33d20af30..ad0f925feea 100644 --- a/Libraries/LibWeb/Painting/Command.h +++ b/Libraries/LibWeb/Painting/DisplayListCommand.h @@ -482,7 +482,7 @@ struct ApplyMaskBitmap { void dump(StringBuilder&) const; }; -using Command = Variant< +using DisplayListCommand = Variant< DrawGlyphRun, FillRect, DrawPaintingSurface, diff --git a/Libraries/LibWeb/Painting/DisplayListPlayerSkia.h b/Libraries/LibWeb/Painting/DisplayListPlayerSkia.h index 918165c239a..193149bb983 100644 --- a/Libraries/LibWeb/Painting/DisplayListPlayerSkia.h +++ b/Libraries/LibWeb/Painting/DisplayListPlayerSkia.h @@ -7,8 +7,8 @@ #pragma once #include -#include #include +#include #include class GrDirectContext; diff --git a/Libraries/LibWeb/Painting/DisplayListRecorder.cpp b/Libraries/LibWeb/Painting/DisplayListRecorder.cpp index c2f4a563614..323c65d90c0 100644 --- a/Libraries/LibWeb/Painting/DisplayListRecorder.cpp +++ b/Libraries/LibWeb/Painting/DisplayListRecorder.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include +#include #include #include