mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-07-31 13:19:05 +00:00
WebContent: Move screenshot requests handling into repaint loop
This change ensures that if a screenshot is requested between teardown of paintable tree and relayout, we will wait for layout to complete before taking a screenshot.
This commit is contained in:
parent
6014727c20
commit
cbbe49cdf0
Notes:
sideshowbarker
2024-07-17 03:03:44 +09:00
Author: https://github.com/kalenikaliaksandr
Commit: cbbe49cdf0
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/233
Reviewed-by: https://github.com/ADKaster
Reviewed-by: https://github.com/bugaevc
3 changed files with 35 additions and 25 deletions
|
@ -196,6 +196,26 @@ Web::Layout::Viewport* PageClient::layout_root()
|
|||
|
||||
void PageClient::paint_next_frame()
|
||||
{
|
||||
while (!m_screenshot_tasks.is_empty()) {
|
||||
auto task = m_screenshot_tasks.dequeue();
|
||||
if (task.node_id.has_value()) {
|
||||
auto* dom_node = Web::DOM::Node::from_unique_id(*task.node_id);
|
||||
if (!dom_node || !dom_node->paintable_box()) {
|
||||
client().async_did_take_screenshot(m_id, {});
|
||||
continue;
|
||||
}
|
||||
auto rect = page().enclosing_device_rect(dom_node->paintable_box()->absolute_border_box_rect());
|
||||
auto bitmap = Gfx::Bitmap::create(Gfx::BitmapFormat::BGRA8888, rect.size().to_type<int>()).release_value_but_fixme_should_propagate_errors();
|
||||
paint(rect, *bitmap, { .paint_overlay = Web::PaintOptions::PaintOverlay::No });
|
||||
client().async_did_take_screenshot(m_id, bitmap->to_shareable_bitmap());
|
||||
} else {
|
||||
Web::DevicePixelRect rect { { 0, 0 }, content_size() };
|
||||
auto bitmap = Gfx::Bitmap::create(Gfx::BitmapFormat::BGRA8888, rect.size().to_type<int>()).release_value_but_fixme_should_propagate_errors();
|
||||
paint(rect, *bitmap);
|
||||
client().async_did_take_screenshot(m_id, bitmap->to_shareable_bitmap());
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_backing_stores.back_bitmap) {
|
||||
return;
|
||||
}
|
||||
|
@ -731,4 +751,10 @@ Web::PaintingCommandExecutorType PageClient::painting_command_executor_type() co
|
|||
return Web::PaintingCommandExecutorType::CPU;
|
||||
}
|
||||
|
||||
void PageClient::queue_screenshot_task(Optional<i32> node_id)
|
||||
{
|
||||
m_screenshot_tasks.enqueue({ node_id });
|
||||
page().top_level_traversable()->set_needs_display();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue