RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 20:17:44 +00:00
Code Issues Activity Actions

Everywhere: Use unqualified AK::URL

Browse source 
Now possible in LibWeb now that there is no longer a Web::URL.
This commit is contained in:
Shannon Booth 2024-02-11 20:15:39 +13:00 • committed by Andreas Kling
parent f9e5b43b7a
commit 9ce8189f21
156 changed files with 471 additions and 471 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,12 +94,12 @@ RefPtr<Web::ResourceLoaderConnectorRequest> RequestServerAdapter::start_request(
return RequestServerRequestAdapter::try_create(protocol_request.release_nonnull()).release_value_but_fixme_should_propagate_errors();
}
void RequestServerAdapter::prefetch_dns(AK::URL const& url)
void RequestServerAdapter::prefetch_dns(URL const& url)
{
m_protocol_client->ensure_connection(url, RequestServer::CacheLevel::ResolveOnly);
}
void RequestServerAdapter::preconnect(AK::URL const& url)
void RequestServerAdapter::preconnect(URL const& url)
{
m_protocol_client->ensure_connection(url, RequestServer::CacheLevel::CreateConnection);
}

4
Userland/Libraries/LibWebView/RequestServerAdapter.h
View file

@ -42,8 +42,8 @@ public:
static ErrorOr<NonnullRefPtr<RequestServerAdapter>> try_create();
virtual ~RequestServerAdapter() override;
virtual void prefetch_dns(AK::URL const& url) override;
virtual void preconnect(AK::URL const& url) override;
virtual void prefetch_dns(URL const& url) override;
virtual void preconnect(URL const& url) override;
virtual RefPtr<Web::ResourceLoaderConnectorRequest> start_request(ByteString const& method, URL const&, HashMap<ByteString, ByteString> const& request_headers = {}, ReadonlyBytes request_body = {}, Core::ProxyData const& = {}) override;

2
Userland/Libraries/LibWebView/ViewImplementation.cpp
View file

@ -74,7 +74,7 @@ void ViewImplementation::server_did_paint(Badge<WebContentClient>, i32 bitmap_id
client().async_ready_to_paint(page_id());
}
void ViewImplementation::load(AK::URL const& url)
void ViewImplementation::load(URL const& url)
{
m_url = url;
client().async_load_url(page_id(), url);

32
Userland/Libraries/LibWebView/ViewImplementation.h
View file

@ -35,14 +35,14 @@ public:
String aria_properties_state_json;
};
void set_url(Badge<WebContentClient>, AK::URL url) { m_url = move(url); }
AK::URL const& url() const { return m_url; }
void set_url(Badge<WebContentClient>, URL url) { m_url = move(url); }
URL const& url() const { return m_url; }
String const& handle() const { return m_client_state.client_handle; }
void server_did_paint(Badge<WebContentClient>, i32 bitmap_id, Gfx::IntSize size);
void load(AK::URL const&);
void load(URL const&);
void load_html(StringView);
void load_empty_document();
@ -116,16 +116,16 @@ public:
Function<void()> on_activate_tab;
Function<void()> on_close;
Function<void(Gfx::IntPoint screen_position)> on_context_menu_request;
Function<void(const AK::URL&, Gfx::IntPoint screen_position)> on_link_context_menu_request;
Function<void(const AK::URL&, Gfx::IntPoint screen_position, Gfx::ShareableBitmap const&)> on_image_context_menu_request;
Function<void(const URL&, Gfx::IntPoint screen_position)> on_link_context_menu_request;
Function<void(const URL&, Gfx::IntPoint screen_position, Gfx::ShareableBitmap const&)> on_image_context_menu_request;
Function<void(Gfx::IntPoint screen_position, Web::Page::MediaContextMenu const&)> on_media_context_menu_request;
Function<void(const AK::URL&)> on_link_hover;
Function<void(const URL&)> on_link_hover;
Function<void()> on_link_unhover;
Function<void(const AK::URL&, ByteString const& target, unsigned modifiers)> on_link_click;
Function<void(const AK::URL&, ByteString const& target, unsigned modifiers)> on_link_middle_click;
Function<void(const URL&, ByteString const& target, unsigned modifiers)> on_link_click;
Function<void(const URL&, ByteString const& target, unsigned modifiers)> on_link_middle_click;
Function<void(ByteString const&)> on_title_change;
Function<void(const AK::URL&, bool)> on_load_start;
Function<void(const AK::URL&)> on_load_finish;
Function<void(const URL&, bool)> on_load_start;
Function<void(const URL&)> on_load_finish;
Function<void(ByteString const& path, i32)> on_request_file;
Function<void()> on_navigate_back;
Function<void()> on_navigate_forward;
@ -142,7 +142,7 @@ public:
Function<void(String const& message)> on_request_set_prompt_text;
Function<void()> on_request_accept_dialog;
Function<void()> on_request_dismiss_dialog;
Function<void(const AK::URL&, ByteString const&)> on_received_source;
Function<void(const URL&, ByteString const&)> on_received_source;
Function<void(ByteString const&)> on_received_dom_tree;
Function<void(Optional<DOMNodeProperties>)> on_received_dom_node_properties;
Function<void(ByteString const&)> on_received_accessibility_tree;
@ -151,10 +151,10 @@ public:
Function<void(String const&)> on_received_dom_node_html;
Function<void(i32 message_id)> on_received_console_message;
Function<void(i32 start_index, Vector<ByteString> const& message_types, Vector<ByteString> const& messages)> on_received_console_messages;
Function<Vector<Web::Cookie::Cookie>(AK::URL const& url)> on_get_all_cookies;
Function<Optional<Web::Cookie::Cookie>(AK::URL const& url, String const& name)> on_get_named_cookie;
Function<String(const AK::URL& url, Web::Cookie::Source source)> on_get_cookie;
Function<void(const AK::URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)> on_set_cookie;
Function<Vector<Web::Cookie::Cookie>(URL const& url)> on_get_all_cookies;
Function<Optional<Web::Cookie::Cookie>(URL const& url, String const& name)> on_get_named_cookie;
Function<String(const URL& url, Web::Cookie::Source source)> on_get_cookie;
Function<void(const URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)> on_set_cookie;
Function<void(Web::Cookie::Cookie const& cookie)> on_update_cookie;
Function<void(i32 count_waiting)> on_resource_status_change;
Function<void()> on_restore_window;
@ -227,7 +227,7 @@ protected:
bool has_usable_bitmap { false };
} m_client_state;
AK::URL m_url;
URL m_url;
float m_zoom_level { 1.0 };
float m_device_pixel_ratio { 1.0 };

24
Userland/Libraries/LibWebView/WebContentClient.cpp
View file

@ -46,7 +46,7 @@ void WebContentClient::did_paint(u64 page_id, Gfx::IntRect const& rect, i32 bitm
view.server_did_paint({}, bitmap_id, rect.size());
}
void WebContentClient::did_start_loading(u64 page_id, AK::URL const& url, bool is_redirect)
void WebContentClient::did_start_loading(u64 page_id, URL const& url, bool is_redirect)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -61,7 +61,7 @@ void WebContentClient::did_start_loading(u64 page_id, AK::URL const& url, bool i
view.on_load_start(url, is_redirect);
}
void WebContentClient::did_finish_loading(u64 page_id, AK::URL const& url)
void WebContentClient::did_finish_loading(u64 page_id, URL const& url)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -231,7 +231,7 @@ void WebContentClient::did_leave_tooltip_area(u64 page_id)
view.on_leave_tooltip_area();
}
void WebContentClient::did_hover_link(u64 page_id, AK::URL const& url)
void WebContentClient::did_hover_link(u64 page_id, URL const& url)
{
dbgln_if(SPAM_DEBUG, "handle: WebContentClient::DidHoverLink! url={}", url);
auto maybe_view = m_views.get(page_id);
@ -259,7 +259,7 @@ void WebContentClient::did_unhover_link(u64 page_id)
view.on_link_unhover();
}
void WebContentClient::did_click_link(u64 page_id, AK::URL const& url, ByteString const& target, unsigned modifiers)
void WebContentClient::did_click_link(u64 page_id, URL const& url, ByteString const& target, unsigned modifiers)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -272,7 +272,7 @@ void WebContentClient::did_click_link(u64 page_id, AK::URL const& url, ByteStrin
view.on_link_click(url, target, modifiers);
}
void WebContentClient::did_middle_click_link(u64 page_id, AK::URL const& url, ByteString const& target, unsigned modifiers)
void WebContentClient::did_middle_click_link(u64 page_id, URL const& url, ByteString const& target, unsigned modifiers)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -298,7 +298,7 @@ void WebContentClient::did_request_context_menu(u64 page_id, Gfx::IntPoint conte
view.on_context_menu_request(view.to_widget_position(content_position));
}
void WebContentClient::did_request_link_context_menu(u64 page_id, Gfx::IntPoint content_position, AK::URL const& url, ByteString const&, unsigned)
void WebContentClient::did_request_link_context_menu(u64 page_id, Gfx::IntPoint content_position, URL const& url, ByteString const&, unsigned)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -311,7 +311,7 @@ void WebContentClient::did_request_link_context_menu(u64 page_id, Gfx::IntPoint
view.on_link_context_menu_request(url, view.to_widget_position(content_position));
}
void WebContentClient::did_request_image_context_menu(u64 page_id, Gfx::IntPoint content_position, AK::URL const& url, ByteString const&, unsigned, Gfx::ShareableBitmap const& bitmap)
void WebContentClient::did_request_image_context_menu(u64 page_id, Gfx::IntPoint content_position, URL const& url, ByteString const&, unsigned, Gfx::ShareableBitmap const& bitmap)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -337,7 +337,7 @@ void WebContentClient::did_request_media_context_menu(u64 page_id, Gfx::IntPoint
view.on_media_context_menu_request(view.to_widget_position(content_position), menu);
}
void WebContentClient::did_get_source(u64 page_id, AK::URL const& url, ByteString const& source)
void WebContentClient::did_get_source(u64 page_id, URL const& url, ByteString const& source)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -576,7 +576,7 @@ void WebContentClient::did_change_favicon(u64 page_id, Gfx::ShareableBitmap cons
view.on_favicon_change(*favicon.bitmap());
}
Messages::WebContentClient::DidRequestAllCookiesResponse WebContentClient::did_request_all_cookies(u64 page_id, AK::URL const& url)
Messages::WebContentClient::DidRequestAllCookiesResponse WebContentClient::did_request_all_cookies(u64 page_id, URL const& url)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -590,7 +590,7 @@ Messages::WebContentClient::DidRequestAllCookiesResponse WebContentClient::did_r
return Vector<Web::Cookie::Cookie> {};
}
Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_request_named_cookie(u64 page_id, AK::URL const& url, String const& name)
Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_request_named_cookie(u64 page_id, URL const& url, String const& name)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -604,7 +604,7 @@ Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_
return OptionalNone {};
}
Messages::WebContentClient::DidRequestCookieResponse WebContentClient::did_request_cookie(u64 page_id, AK::URL const& url, Web::Cookie::Source source)
Messages::WebContentClient::DidRequestCookieResponse WebContentClient::did_request_cookie(u64 page_id, URL const& url, Web::Cookie::Source source)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {
@ -618,7 +618,7 @@ Messages::WebContentClient::DidRequestCookieResponse WebContentClient::did_reque
return String {};
}
void WebContentClient::did_set_cookie(u64 page_id, AK::URL const& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)
void WebContentClient::did_set_cookie(u64 page_id, URL const& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source)
{
auto maybe_view = m_views.get(page_id);
if (!maybe_view.has_value()) {

24
Userland/Libraries/LibWebView/WebContentClient.h
View file

@ -35,7 +35,7 @@ private:
virtual void die() override;
virtual void did_paint(u64 page_id, Gfx::IntRect const&, i32) override;
virtual void did_finish_loading(u64 page_id, AK::URL const&) override;
virtual void did_finish_loading(u64 page_id, URL const&) override;
virtual void did_request_navigate_back(u64 page_id) override;
virtual void did_request_navigate_forward(u64 page_id) override;
virtual void did_request_refresh(u64 page_id) override;
@ -46,16 +46,16 @@ private:
virtual void did_request_scroll_to(u64 page_id, Gfx::IntPoint) override;
virtual void did_enter_tooltip_area(u64 page_id, Gfx::IntPoint, ByteString const&) override;
virtual void did_leave_tooltip_area(u64 page_id) override;
virtual void did_hover_link(u64 page_id, AK::URL const&) override;
virtual void did_hover_link(u64 page_id, URL const&) override;
virtual void did_unhover_link(u64 page_id) override;
virtual void did_click_link(u64 page_id, AK::URL const&, ByteString const&, unsigned) override;
virtual void did_middle_click_link(u64 page_id, AK::URL const&, ByteString const&, unsigned) override;
virtual void did_start_loading(u64 page_id, AK::URL const&, bool) override;
virtual void did_click_link(u64 page_id, URL const&, ByteString const&, unsigned) override;
virtual void did_middle_click_link(u64 page_id, URL const&, ByteString const&, unsigned) override;
virtual void did_start_loading(u64 page_id, URL const&, bool) override;
virtual void did_request_context_menu(u64 page_id, Gfx::IntPoint) override;
virtual void did_request_link_context_menu(u64 page_id, Gfx::IntPoint, AK::URL const&, ByteString const&, unsigned) override;
virtual void did_request_image_context_menu(u64 page_id, Gfx::IntPoint, AK::URL const&, ByteString const&, unsigned, Gfx::ShareableBitmap const&) override;
virtual void did_request_link_context_menu(u64 page_id, Gfx::IntPoint, URL const&, ByteString const&, unsigned) override;
virtual void did_request_image_context_menu(u64 page_id, Gfx::IntPoint, URL const&, ByteString const&, unsigned, Gfx::ShareableBitmap const&) override;
virtual void did_request_media_context_menu(u64 page_id, Gfx::IntPoint, ByteString const&, unsigned, Web::Page::MediaContextMenu const&) override;
virtual void did_get_source(u64 page_id, AK::URL const&, ByteString const&) override;
virtual void did_get_source(u64 page_id, URL const&, ByteString const&) override;
virtual void did_inspect_dom_tree(u64 page_id, ByteString const&) override;
virtual void did_inspect_dom_node(u64 page_id, bool has_style, ByteString const& computed_style, ByteString const& resolved_style, ByteString const& custom_properties, ByteString const& node_box_sizing, ByteString const& aria_properties_state) override;
virtual void did_inspect_accessibility_tree(u64 page_id, ByteString const&) override;
@ -72,10 +72,10 @@ private:
virtual void did_request_set_prompt_text(u64 page_id, String const& message) override;
virtual void did_request_accept_dialog(u64 page_id) override;
virtual void did_request_dismiss_dialog(u64 page_id) override;
virtual Messages::WebContentClient::DidRequestAllCookiesResponse did_request_all_cookies(u64 page_id, AK::URL const&) override;
virtual Messages::WebContentClient::DidRequestNamedCookieResponse did_request_named_cookie(u64 page_id, AK::URL const&, String const&) override;
virtual Messages::WebContentClient::DidRequestCookieResponse did_request_cookie(u64 page_id, AK::URL const&, Web::Cookie::Source) override;
virtual void did_set_cookie(u64 page_id, AK::URL const&, Web::Cookie::ParsedCookie const&, Web::Cookie::Source) override;
virtual Messages::WebContentClient::DidRequestAllCookiesResponse did_request_all_cookies(u64 page_id, URL const&) override;
virtual Messages::WebContentClient::DidRequestNamedCookieResponse did_request_named_cookie(u64 page_id, URL const&, String const&) override;
virtual Messages::WebContentClient::DidRequestCookieResponse did_request_cookie(u64 page_id, URL const&, Web::Cookie::Source) override;
virtual void did_set_cookie(u64 page_id, URL const&, Web::Cookie::ParsedCookie const&, Web::Cookie::Source) override;
virtual void did_update_cookie(u64 page_id, Web::Cookie::Cookie const&) override;
virtual Messages::WebContentClient::DidRequestNewWebViewResponse did_request_new_web_view(u64 page_id, Web::HTML::ActivateTab const&, Web::HTML::WebViewHints const&, Optional<u64> const& page_index) override;
virtual void did_request_activate_tab(u64 page_id) override;

2
Userland/Libraries/LibWebView/WebSocketClientAdapter.cpp
View file

@ -125,7 +125,7 @@ WebSocketClientManagerAdapter::WebSocketClientManagerAdapter(NonnullRefPtr<Proto
WebSocketClientManagerAdapter::~WebSocketClientManagerAdapter() = default;
RefPtr<Web::WebSockets::WebSocketClientSocket> WebSocketClientManagerAdapter::connect(const AK::URL& url, ByteString const& origin, Vector<ByteString> const& protocols)
RefPtr<Web::WebSockets::WebSocketClientSocket> WebSocketClientManagerAdapter::connect(const URL& url, ByteString const& origin, Vector<ByteString> const& protocols)
{
auto underlying_websocket = m_websocket_client->connect(url, origin, protocols);
if (!underlying_websocket)

2
Userland/Libraries/LibWebView/WebSocketClientAdapter.h
View file

@ -45,7 +45,7 @@ public:
virtual ~WebSocketClientManagerAdapter() override;
virtual RefPtr<Web::WebSockets::WebSocketClientSocket> connect(const AK::URL&, ByteString const& origin, Vector<ByteString> const& protocols) override;
virtual RefPtr<Web::WebSockets::WebSocketClientSocket> connect(const URL&, ByteString const& origin, Vector<ByteString> const& protocols) override;
private:
WebSocketClientManagerAdapter(NonnullRefPtr<Protocol::WebSocketClient>);