beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-29 08:11:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

RequestServer: Remove download progress updates that nobody used

Browse source
This commit is contained in:
Andreas Kling 2024-09-17 15:02:34 +02:00 committed by Andreas Kling
parent f0fc516cf2
commit 853a75c4ab
Notes: github-actions[bot] 2024-09-19 05:38:44 +00:00 
Author: https://github.com/awesomekling
Commit: https://github.com/LadybirdBrowser/ladybird/commit/853a75c4ab5
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/1400
7 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Userland/Libraries/LibRequests/Request.cpp
View file

@ -19,7 +19,6 @@ bool Request::stop()
{ {
on_headers_received = nullptr; on_headers_received = nullptr;
on_finish = nullptr; on_finish = nullptr;
on_progress = nullptr;
on_certificate_requested = nullptr; on_certificate_requested = nullptr;
m_internal_buffered_data = nullptr; m_internal_buffered_data = nullptr;
@ -88,12 +87,6 @@ void Request::did_finish(Badge<RequestClient>, bool success, u64 total_size)
on_finish(success, total_size); on_finish(success, total_size);
} }
void Request::did_progress(Badge<RequestClient>, Optional<u64> total_size, u64 downloaded_size)
{
if (on_progress)
on_progress(total_size, downloaded_size);
}
void Request::did_receive_headers(Badge<RequestClient>, HTTP::HeaderMap const& response_headers, Optional<u32> response_code) void Request::did_receive_headers(Badge<RequestClient>, HTTP::HeaderMap const& response_headers, Optional<u32> response_code)
{ {
if (on_headers_received) if (on_headers_received)

2
Userland/Libraries/LibRequests/Request.h
View file

@ -51,11 +51,9 @@ public:
// mutually exclusive with `set_buffered_request_finished_callback`. // mutually exclusive with `set_buffered_request_finished_callback`.
void set_unbuffered_request_callbacks(HeadersReceived, DataReceived, RequestFinished); void set_unbuffered_request_callbacks(HeadersReceived, DataReceived, RequestFinished);
Function<void(Optional<u64> total_size, u64 downloaded_size)> on_progress;
Function<CertificateAndKey()> on_certificate_requested; Function<CertificateAndKey()> on_certificate_requested;
void did_finish(Badge<RequestClient>, bool success, u64 total_size); void did_finish(Badge<RequestClient>, bool success, u64 total_size);
void did_progress(Badge<RequestClient>, Optional<u64> total_size, u64 downloaded_size);
void did_receive_headers(Badge<RequestClient>, HTTP::HeaderMap const& response_headers, Optional<u32> response_code); void did_receive_headers(Badge<RequestClient>, HTTP::HeaderMap const& response_headers, Optional<u32> response_code);
void did_request_certificates(Badge<RequestClient>); void did_request_certificates(Badge<RequestClient>);

7
Userland/Libraries/LibRequests/RequestClient.cpp
View file

@ -77,13 +77,6 @@ void RequestClient::request_finished(i32 request_id, bool success, u64 total_siz
m_requests.remove(request_id); m_requests.remove(request_id);
} }
void RequestClient::request_progress(i32 request_id, Optional<u64> const& total_size, u64 downloaded_size)
{
if (auto request = const_cast<Request*>(m_requests.get(request_id).value_or(nullptr))) {
request->did_progress({}, total_size, downloaded_size);
}
}
void RequestClient::headers_became_available(i32 request_id, HTTP::HeaderMap const& response_headers, Optional<u32> const& status_code) void RequestClient::headers_became_available(i32 request_id, HTTP::HeaderMap const& response_headers, Optional<u32> const& status_code)
{ {
auto request = const_cast<Request*>(m_requests.get(request_id).value_or(nullptr)); auto request = const_cast<Request*>(m_requests.get(request_id).value_or(nullptr));

1
Userland/Libraries/LibRequests/RequestClient.h
View file

@ -40,7 +40,6 @@ private:
virtual void die() override; virtual void die() override;
virtual void request_started(i32, IPC::File const&) override; virtual void request_started(i32, IPC::File const&) override;
virtual void request_progress(i32, Optional<u64> const&, u64) override;
virtual void request_finished(i32, bool, u64) override; virtual void request_finished(i32, bool, u64) override;
virtual void certificate_requested(i32) override; virtual void certificate_requested(i32) override;
virtual void headers_became_available(i32, HTTP::HeaderMap const&, Optional<u32> const&) override; virtual void headers_became_available(i32, HTTP::HeaderMap const&, Optional<u32> const&) override;

6
Userland/Libraries/LibWebView/RequestServerAdapter.cpp
View file

@ -19,12 +19,6 @@ ErrorOr<NonnullRefPtr<RequestServerRequestAdapter>> RequestServerRequestAdapter:
RequestServerRequestAdapter::RequestServerRequestAdapter(NonnullRefPtr<Requests::Request> request) RequestServerRequestAdapter::RequestServerRequestAdapter(NonnullRefPtr<Requests::Request> request)
: m_request(request) : m_request(request)
{ {
request->on_progress = [weak_this = make_weak_ptr()](Optional<u64> total_size, u64 downloaded_size) {
if (auto strong_this = weak_this.strong_ref())
if (strong_this->on_progress)
strong_this->on_progress(total_size, downloaded_size);
};
request->on_certificate_requested = [weak_this = make_weak_ptr()]() { request->on_certificate_requested = [weak_this = make_weak_ptr()]() {
if (auto strong_this = weak_this.strong_ref()) { if (auto strong_this = weak_this.strong_ref()) {
if (strong_this->on_certificate_requested) { if (strong_this->on_certificate_requested) {

5
Userland/Services/RequestServer/ConnectionFromClient.cpp
View file

@ -116,11 +116,6 @@ size_t ConnectionFromClient::on_data_received(void* buffer, size_t size, size_t
request->downloaded_so_far += total_size; request->downloaded_so_far += total_size;
request->client->async_request_progress(
request->request_id,
content_length_for_ipc,
request->downloaded_so_far);
return total_size; return total_size;
} }

1
Userland/Services/RequestServer/RequestClient.ipc
View file

@ -4,7 +4,6 @@
endpoint RequestClient endpoint RequestClient
{ {
request_started(i32 request_id, IPC::File fd) =| request_started(i32 request_id, IPC::File fd) =|
request_progress(i32 request_id, Optional<u64> total_size, u64 downloaded_size) =|
request_finished(i32 request_id, bool success, u64 total_size) =| request_finished(i32 request_id, bool success, u64 total_size) =|
headers_became_available(i32 request_id, HTTP::HeaderMap response_headers, Optional<u32> status_code) =| headers_became_available(i32 request_id, HTTP::HeaderMap response_headers, Optional<u32> status_code) =|