mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-03 06:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Use handle_failed_fetch to implement handle_failed_decode

Browse source 
...When loading images through SharedImageRequest.

There is a small behavioural difference here - handle_failed_fetch
clears the pending callbacks whereas handled_failed_decode was
previously not. This does not seem intentional, and appears like a bug.

Implementing it this way is _slightly_ simpler - and also means we
don't need to take a strong handle to this in the case of loading an
SVG image.
This commit is contained in:
Shannon Booth 2024-08-03 14:18:43 +12:00 • committed by Andreas Kling
commit e0f2e42687
Notes: github-actions[bot] 2024-08-05 09:27:49 +00:00
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Libraries/LibWeb/HTML/SharedImageRequest.cpp
View file

@ -145,14 +145,6 @@ void SharedImageRequest::handle_successful_fetch(URL::URL const& url_string, Str
bool const is_svg_image = mime_type == "image/svg+xml"sv || url_string.basename().ends_with(".svg"sv); bool const is_svg_image = mime_type == "image/svg+xml"sv || url_string.basename().ends_with(".svg"sv);
auto handle_failed_decode = [strong_this = JS::Handle(*this)](Error&) -> void {
strong_this->m_state = State::Failed;
for (auto& callback : strong_this->m_callbacks) {
if (callback.on_fail)
callback.on_fail->function()();
}
};
auto handle_successful_decode = [](SharedImageRequest& self) { auto handle_successful_decode = [](SharedImageRequest& self) {
self.m_state = State::Finished; self.m_state = State::Finished;
for (auto& callback : self.m_callbacks) { for (auto& callback : self.m_callbacks) {
@ -165,7 +157,7 @@ void SharedImageRequest::handle_successful_fetch(URL::URL const& url_string, Str
if (is_svg_image) { if (is_svg_image) {
auto result = SVG::SVGDecodedImageData::create(m_document->realm(), m_page, url_string, data); auto result = SVG::SVGDecodedImageData::create(m_document->realm(), m_page, url_string, data);
if (result.is_error()) { if (result.is_error()) {
handle_failed_decode(result.error()); handle_failed_fetch();
} else { } else {
m_image_data = result.release_value(); m_image_data = result.release_value();
handle_successful_decode(*this); handle_successful_decode(*this);
@ -186,6 +178,10 @@ void SharedImageRequest::handle_successful_fetch(URL::URL const& url_string, Str
return {}; return {};
}; };
auto handle_failed_decode = [strong_this = JS::Handle(*this)](Error&) -> void {
strong_this->handle_failed_fetch();
};
(void)Web::Platform::ImageCodecPlugin::the().decode_image(data.bytes(), move(handle_successful_bitmap_decode), move(handle_failed_decode)); (void)Web::Platform::ImageCodecPlugin::the().decode_image(data.bytes(), move(handle_successful_bitmap_decode), move(handle_failed_decode));
} }