RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 02:14:57 +00:00
Code Issues Activity Actions

LibHTML: Fire the file:// load completion callback asynchronously

Browse source 
This makes it consistent with how http:// callbacks are fired.
It would probably be fine to have file:// be synchronous, but at the
same time it's nice to have consistency.
This commit is contained in:
Andreas Kling 2019-10-08 19:40:48 +02:00
parent 3be6d1aff0
commit a1c8c754eb
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibHTML/ResourceLoader.cpp
View file

@ -8,7 +8,7 @@ ResourceLoader& ResourceLoader::the()
{
static ResourceLoader* s_the;
if (!s_the)
s_the = new ResourceLoader;
s_the = &ResourceLoader::construct().leak_ref();
return *s_the;
}
@ -18,13 +18,15 @@ void ResourceLoader::load(const URL& url, Function<void(const ByteBuffer&)> call
auto f = CFile::construct();
f->set_filename(url.path());
if (!f->open(CIODevice::OpenMode::ReadOnly)) {
dbg() << "HtmlView::load: Error: " << f->error_string();
dbg() << "ResourceLoader::load: Error: " << f->error_string();
callback({});
return;
}
auto data = f->read_all();
callback(data);
deferred_invoke([data = move(data), callback = move(callback)](auto&) {
callback(data);
});
return;
}