diff --git a/Userland/Libraries/LibRequests/Request.cpp b/Userland/Libraries/LibRequests/Request.cpp index 545dd83b806..b47e4537346 100644 --- a/Userland/Libraries/LibRequests/Request.cpp +++ b/Userland/Libraries/LibRequests/Request.cpp @@ -19,7 +19,6 @@ bool Request::stop() { on_headers_received = nullptr; on_finish = nullptr; - on_progress = nullptr; on_certificate_requested = nullptr; m_internal_buffered_data = nullptr; @@ -88,12 +87,6 @@ void Request::did_finish(Badge, bool success, u64 total_size) on_finish(success, total_size); } -void Request::did_progress(Badge, Optional total_size, u64 downloaded_size) -{ - if (on_progress) - on_progress(total_size, downloaded_size); -} - void Request::did_receive_headers(Badge, HTTP::HeaderMap const& response_headers, Optional response_code) { if (on_headers_received) diff --git a/Userland/Libraries/LibRequests/Request.h b/Userland/Libraries/LibRequests/Request.h index 3b302903d3e..38a13a93a8d 100644 --- a/Userland/Libraries/LibRequests/Request.h +++ b/Userland/Libraries/LibRequests/Request.h @@ -51,11 +51,9 @@ public: // mutually exclusive with `set_buffered_request_finished_callback`. void set_unbuffered_request_callbacks(HeadersReceived, DataReceived, RequestFinished); - Function total_size, u64 downloaded_size)> on_progress; Function on_certificate_requested; void did_finish(Badge, bool success, u64 total_size); - void did_progress(Badge, Optional total_size, u64 downloaded_size); void did_receive_headers(Badge, HTTP::HeaderMap const& response_headers, Optional response_code); void did_request_certificates(Badge); diff --git a/Userland/Libraries/LibRequests/RequestClient.cpp b/Userland/Libraries/LibRequests/RequestClient.cpp index bfdf11a9194..d0e3e3c780f 100644 --- a/Userland/Libraries/LibRequests/RequestClient.cpp +++ b/Userland/Libraries/LibRequests/RequestClient.cpp @@ -77,13 +77,6 @@ void RequestClient::request_finished(i32 request_id, bool success, u64 total_siz m_requests.remove(request_id); } -void RequestClient::request_progress(i32 request_id, Optional const& total_size, u64 downloaded_size) -{ - if (auto request = const_cast(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 const& status_code) { auto request = const_cast(m_requests.get(request_id).value_or(nullptr)); diff --git a/Userland/Libraries/LibRequests/RequestClient.h b/Userland/Libraries/LibRequests/RequestClient.h index 0465d8e2f3b..f5ca6fa14ef 100644 --- a/Userland/Libraries/LibRequests/RequestClient.h +++ b/Userland/Libraries/LibRequests/RequestClient.h @@ -40,7 +40,6 @@ private: virtual void die() override; virtual void request_started(i32, IPC::File const&) override; - virtual void request_progress(i32, Optional const&, u64) override; virtual void request_finished(i32, bool, u64) override; virtual void certificate_requested(i32) override; virtual void headers_became_available(i32, HTTP::HeaderMap const&, Optional const&) override; diff --git a/Userland/Libraries/LibWebView/RequestServerAdapter.cpp b/Userland/Libraries/LibWebView/RequestServerAdapter.cpp index a0a15afde55..8fb24193151 100644 --- a/Userland/Libraries/LibWebView/RequestServerAdapter.cpp +++ b/Userland/Libraries/LibWebView/RequestServerAdapter.cpp @@ -19,12 +19,6 @@ ErrorOr> RequestServerRequestAdapter: RequestServerRequestAdapter::RequestServerRequestAdapter(NonnullRefPtr request) : m_request(request) { - request->on_progress = [weak_this = make_weak_ptr()](Optional 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()]() { if (auto strong_this = weak_this.strong_ref()) { if (strong_this->on_certificate_requested) { diff --git a/Userland/Services/RequestServer/ConnectionFromClient.cpp b/Userland/Services/RequestServer/ConnectionFromClient.cpp index ddfe967f079..f2ed85484bf 100644 --- a/Userland/Services/RequestServer/ConnectionFromClient.cpp +++ b/Userland/Services/RequestServer/ConnectionFromClient.cpp @@ -116,11 +116,6 @@ size_t ConnectionFromClient::on_data_received(void* buffer, size_t size, size_t 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; } diff --git a/Userland/Services/RequestServer/RequestClient.ipc b/Userland/Services/RequestServer/RequestClient.ipc index 46cb89cdbdb..8ea4ac8dcea 100644 --- a/Userland/Services/RequestServer/RequestClient.ipc +++ b/Userland/Services/RequestServer/RequestClient.ipc @@ -4,7 +4,6 @@ endpoint RequestClient { request_started(i32 request_id, IPC::File fd) =| - request_progress(i32 request_id, Optional total_size, u64 downloaded_size) =| request_finished(i32 request_id, bool success, u64 total_size) =| headers_became_available(i32 request_id, HTTP::HeaderMap response_headers, Optional status_code) =|