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

LibWeb: Add timeout_callback to ResourceLoader::load()

Browse source
This commit is contained in:
Kenneth Myhra 2022-07-02 22:32:25 +02:00 • committed by Linus Groh
parent 07b6c7114b
commit 92a3803066
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp
View file

@ -138,7 +138,7 @@ static void emit_signpost(String const& message, int id)
static size_t resource_id = 0; static size_t resource_id = 0;
void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback, Optional<u32> timeout) void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback, Optional<u32> timeout, Function<void()> timeout_callback)
{ {
auto& url = request.url(); auto& url = request.url();
request.start_timer(); request.start_timer();
@ -283,8 +283,10 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
if (timeout.has_value() && timeout.value() > 0) { if (timeout.has_value() && timeout.value() > 0) {
auto timer = Core::Timer::create_single_shot(timeout.value(), nullptr); auto timer = Core::Timer::create_single_shot(timeout.value(), nullptr);
timer->on_timeout = [timer, protocol_request]() mutable { timer->on_timeout = [timer, protocol_request, timeout_callback = move(timeout_callback)]() mutable {
protocol_request->stop(); protocol_request->stop();
if (timeout_callback)
timeout_callback();
}; };
timer->start(); timer->start();
} }
@ -328,11 +330,11 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, Has
error_callback(not_implemented_error, {}); error_callback(not_implemented_error, {});
} }
void ResourceLoader::load(const AK::URL& url, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback, Optional<u32> timeout) void ResourceLoader::load(const AK::URL& url, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback, Optional<u32> timeout, Function<void()> timeout_callback)
{ {
LoadRequest request; LoadRequest request;
request.set_url(url); request.set_url(url);
load(request, move(success_callback), move(error_callback), timeout); load(request, move(success_callback), move(error_callback), timeout, move(timeout_callback));
} }
bool ResourceLoader::is_port_blocked(int port) bool ResourceLoader::is_port_blocked(int port)

4
Userland/Libraries/LibWeb/Loader/ResourceLoader.h
View file

@ -70,8 +70,8 @@ public:
RefPtr<Resource> load_resource(Resource::Type, LoadRequest&); RefPtr<Resource> load_resource(Resource::Type, LoadRequest&);
void load(LoadRequest&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr, Optional<u32> timeout = {}); void load(LoadRequest&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr, Optional<u32> timeout = {}, Function<void()> timeout_callback = nullptr);
void load(const AK::URL&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr, Optional<u32> timeout = {}); void load(const AK::URL&, Function<void(ReadonlyBytes, HashMap<String, String, CaseInsensitiveStringTraits> const& response_headers, Optional<u32> status_code)> success_callback, Function<void(String const&, Optional<u32> status_code)> error_callback = nullptr, Optional<u32> timeout = {}, Function<void()> timeout_callback = nullptr);
ResourceLoaderConnector& connector() { return *m_connector; } ResourceLoaderConnector& connector() { return *m_connector; }