RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 15:07:45 +00:00
Code Issues Activity Actions

LibWeb: Log resource load success before invoking success callback

Browse source 
The success callback may trigger JavaScript execution, causing resource
load times to appear much longer than they actually are. :^)
This commit is contained in:
Andreas Kling 2021-09-22 14:34:28 +02:00
parent 784ab75d2d
commit fccf0a466b
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -129,10 +129,10 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, con
if (url.protocol() == "about") { if (url.protocol() == "about") {
dbgln_if(SPAM_DEBUG, "Loading about: URL {}", url); dbgln_if(SPAM_DEBUG, "Loading about: URL {}", url);
log_success(request);
deferred_invoke([success_callback = move(success_callback)] { deferred_invoke([success_callback = move(success_callback)] {
success_callback(String::empty().to_byte_buffer(), {}, {}); success_callback(String::empty().to_byte_buffer(), {}, {});
}); });
log_success(request);
return; return;
} }
@ -148,10 +148,10 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, con
else else
data = url.data_payload().to_byte_buffer(); data = url.data_payload().to_byte_buffer();
log_success(request);
deferred_invoke([data = move(data), success_callback = move(success_callback)] { deferred_invoke([data = move(data), success_callback = move(success_callback)] {
success_callback(data, {}, {}); success_callback(data, {}, {});
}); });
log_success(request);
return; return;
} }
@ -167,10 +167,10 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, con
auto file = file_result.release_value(); auto file = file_result.release_value();
auto data = file->read_all(); auto data = file->read_all();
log_success(request);
deferred_invoke([data = move(data), success_callback = move(success_callback)] { deferred_invoke([data = move(data), success_callback = move(success_callback)] {
success_callback(data, {}, {}); success_callback(data, {}, {});
}); });
log_success(request);
return; return;
} }
@ -203,8 +203,8 @@ void ResourceLoader::load(LoadRequest& request, Function<void(ReadonlyBytes, con
error_callback(http_load_failure_msg, {}); error_callback(http_load_failure_msg, {});
return; return;
} }
success_callback(payload, response_headers, status_code);
log_success(request); log_success(request);
success_callback(payload, response_headers, status_code);
deferred_invoke([this, &protocol_request] { deferred_invoke([this, &protocol_request] {
m_active_requests.remove(protocol_request); m_active_requests.remove(protocol_request);
}); });