Skip to content

Commit 30cdebf

Browse files
MaxWipfliawesomekling
authored andcommitted
LibProtocol: Use URL class in RequestClient::start_request argument
This changes the RequestClient::start_request() method to take a URL object instead of a URL string as argument. All callers of the method already had a URL object anyway, and start_request() in turn parses the URL string back into a URL object. This removes this unnecessary conversion.
1 parent 5b5f7bc commit 30cdebf

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

Userland/Applications/Browser/DownloadWidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ DownloadWidget::DownloadWidget(const URL& url)
3636
}
3737

3838
m_elapsed_timer.start();
39-
m_download = Web::ResourceLoader::the().protocol_client().start_request("GET", url.to_string());
39+
m_download = Web::ResourceLoader::the().protocol_client().start_request("GET", url);
4040
VERIFY(m_download);
4141
m_download->on_progress = [this](Optional<u32> total_size, u32 downloaded_size) {
4242
did_progress(total_size.value(), downloaded_size);

Userland/Libraries/LibProtocol/RequestClient.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RequestClient::RequestClient()
1616
}
1717

1818
template<typename RequestHashMapTraits>
19-
RefPtr<Request> RequestClient::start_request(String const& method, String const& url, HashMap<String, String, RequestHashMapTraits> const& request_headers, ReadonlyBytes request_body)
19+
RefPtr<Request> RequestClient::start_request(String const& method, URL const& url, HashMap<String, String, RequestHashMapTraits> const& request_headers, ReadonlyBytes request_body)
2020
{
2121
IPC::Dictionary header_dictionary;
2222
for (auto& it : request_headers)
@@ -82,5 +82,5 @@ void RequestClient::certificate_requested(i32 request_id)
8282

8383
}
8484

85-
template RefPtr<Protocol::Request> Protocol::RequestClient::start_request(String const& method, String const& url, HashMap<String, String> const& request_headers, ReadonlyBytes request_body);
86-
template RefPtr<Protocol::Request> Protocol::RequestClient::start_request(String const& method, String const& url, HashMap<String, String, CaseInsensitiveStringTraits> const& request_headers, ReadonlyBytes request_body);
85+
template RefPtr<Protocol::Request> Protocol::RequestClient::start_request(String const& method, URL const&, HashMap<String, String> const& request_headers, ReadonlyBytes request_body);
86+
template RefPtr<Protocol::Request> Protocol::RequestClient::start_request(String const& method, URL const&, HashMap<String, String, CaseInsensitiveStringTraits> const& request_headers, ReadonlyBytes request_body);

Userland/Libraries/LibProtocol/RequestClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class RequestClient final
2222

2323
public:
2424
template<typename RequestHashMapTraits = Traits<String>>
25-
RefPtr<Request> start_request(String const& method, String const& url, HashMap<String, String, RequestHashMapTraits> const& request_headers = {}, ReadonlyBytes request_body = {});
25+
RefPtr<Request> start_request(String const& method, URL const&, HashMap<String, String, RequestHashMapTraits> const& request_headers = {}, ReadonlyBytes request_body = {});
2626

2727
bool stop_request(Badge<Request>, Request&);
2828
bool set_certificate(Badge<Request>, Request&, String, String);

Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ void ResourceLoader::load(const LoadRequest& request, Function<void(ReadonlyByte
156156
headers.set(it.key, it.value);
157157
}
158158

159-
auto protocol_request = protocol_client().start_request(request.method(), url.to_string(), headers, request.body());
159+
auto protocol_request = protocol_client().start_request(request.method(), url, headers, request.body());
160160
if (!protocol_request) {
161161
if (error_callback)
162162
error_callback("Failed to initiate load", {});

Userland/Utilities/pro.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ int main(int argc, char** argv)
186186
Core::EventLoop loop;
187187
auto protocol_client = Protocol::RequestClient::construct();
188188

189-
auto request = protocol_client->start_request(method, url.to_string(), request_headers, data ? StringView { data }.bytes() : ReadonlyBytes {});
189+
auto request = protocol_client->start_request(method, url, request_headers, data ? StringView { data }.bytes() : ReadonlyBytes {});
190190
if (!request) {
191191
warnln("Failed to start request for '{}'", url_str);
192192
return 1;

0 commit comments

Comments
 (0)