Ladybird/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-06-07 21:17:07 +09:00
Code Activity

LibWebView: Do not make the client bitmap shareable for screenshots

Browse source 
Not sure what the issue is here, but it seems to cause very incorrect
screenshots on macOS. In any case, it's wasted computation.
This commit is contained in:
Timothy Flynn 2025-05-29 13:30:45 -04:00 • committed by Tim Flynn
parent 164afdcc59
commit 23855bd412
Notes: github-actions[bot] 2025-05-29 20:25:13 +00:00
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Libraries/LibWebView/ViewImplementation.cpp
View file

@ -673,15 +673,15 @@ void ViewImplementation::do_not_track_changed()
client().async_set_enable_do_not_track(page_id(), do_not_track == DoNotTrack::Yes);
}
static ErrorOr<LexicalPath> save_screenshot(Gfx::ShareableBitmap const& bitmap)
static ErrorOr<LexicalPath> save_screenshot(Gfx::Bitmap const* bitmap)
{
if (!bitmap.is_valid())
if (!bitmap)
return Error::from_string_literal("Failed to take a screenshot");
auto file = Core::DateTime::now().to_byte_string("screenshot-%Y-%m-%d-%H-%M-%S.png"sv);
auto path = TRY(Application::the().path_for_downloaded_file(file));
auto encoded = TRY(Gfx::PNGWriter::encode(*bitmap.bitmap()));
auto encoded = TRY(Gfx::PNGWriter::encode(*bitmap));
auto dump_file = TRY(Core::File::open(path.string(), Core::File::OpenMode::Write));
TRY(dump_file->write_until_depleted(encoded));
@ -700,12 +700,10 @@ NonnullRefPtr<Core::Promise<LexicalPath>> ViewImplementation::take_screenshot(Sc
return promise;
}
Gfx::ShareableBitmap bitmap;
switch (type) {
case ScreenshotType::Visible:
if (auto* visible_bitmap = m_client_state.has_usable_bitmap ? m_client_state.front_bitmap.bitmap.ptr() : m_backup_bitmap.ptr()) {
if (auto result = save_screenshot(visible_bitmap->to_shareable_bitmap()); result.is_error())
if (auto result = save_screenshot(visible_bitmap); result.is_error())
promise->reject(result.release_error());
else
promise->resolve(result.release_value());
@ -742,7 +740,7 @@ void ViewImplementation::did_receive_screenshot(Badge<WebContentClient>, Gfx::Sh
{
VERIFY(m_pending_screenshot);
if (auto result = save_screenshot(screenshot); result.is_error())
if (auto result = save_screenshot(screenshot.bitmap()); result.is_error())
m_pending_screenshot->reject(result.release_error());
else
m_pending_screenshot->resolve(result.release_value());