RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

LibWeb: Always defer callbacks in ResourceClient::set_resource()

Browse source 
Previously, we'd invoke the load/fail callbacks synchronously for
resources that were already loaded and cached.

This patch uses deferred_invoke() in the already-loaded case to ensure
that we always invoke these callbacks in a consistent manner.

This isn't to fix a specific issue, but rather because I kept seeing
these callbacks being invoked synchronously on top of an already-tall
call stack, and it was hard to reason about what was going on.
This commit is contained in:
Andreas Kling 2022-03-20 18:19:55 +01:00
parent d60b3be29a
commit d03680a9e7
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Userland/Libraries/LibWeb/Loader/Resource.cpp
View file

@ -6,6 +6,7 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/Function.h> #include <AK/Function.h>
#include <LibCore/EventLoop.h>
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
#include <LibWeb/HTML/HTMLImageElement.h> #include <LibWeb/HTML/HTMLImageElement.h>
#include <LibWeb/Loader/Resource.h> #include <LibWeb/Loader/Resource.h>
@ -141,13 +142,23 @@ void ResourceClient::set_resource(Resource* resource)
m_resource->register_client({}, *this); m_resource->register_client({}, *this);
// Make sure that reused resources also have their load callback fired. // For resources that are already loaded, we fire their load/fail callbacks via the event loop.
if (resource->is_loaded()) // This ensures that these callbacks always happen in a consistent way, instead of being invoked
resource_did_load(); // synchronously in some cases, and asynchronously in others.
if (resource->is_loaded() || resource->is_failed()) {
Core::deferred_invoke([this, strong_resource = NonnullRefPtr { *m_resource }] {
if (m_resource != strong_resource.ptr())
return;
// Make sure that reused resources also have their fail callback fired. // Make sure that reused resources also have their load callback fired.
if (resource->is_failed()) if (m_resource->is_loaded())
resource_did_fail(); resource_did_load();
// Make sure that reused resources also have their fail callback fired.
if (m_resource->is_failed())
resource_did_fail();
});
}
} }
} }