mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 04:27:45 +00:00
AK+Everywhere: Rename String to DeprecatedString
We have a new, improved string type coming up in AK (OOM aware, no null state), and while it's going to use UTF-8, the name UTF8String is a mouthful - so let's free up the String name by renaming the existing class. Making the old one have an annoying name will hopefully also help with quick adoption :^)
This commit is contained in:
Linus Groh
Andreas Kling
parent
f74251606d
commit
6e19ab2bbc
2006 changed files with 11635 additions and 11636 deletions
|
|
@ -95,7 +95,7 @@ int DOMTreeModel::column_count(const GUI::ModelIndex&) const
|
|||
return 1;
|
||||
}
|
||||
|
||||
static String with_whitespace_collapsed(StringView string)
|
||||
static DeprecatedString with_whitespace_collapsed(StringView string)
|
||||
{
|
||||
StringBuilder builder;
|
||||
for (size_t i = 0; i < string.length(); ++i) {
|
||||
|
|
@ -153,7 +153,7 @@ GUI::Variant DOMTreeModel::data(const GUI::ModelIndex& index, GUI::ModelRole rol
|
|||
if (type == "text")
|
||||
return with_whitespace_collapsed(node.get("text"sv).as_string());
|
||||
if (type == "comment"sv)
|
||||
return String::formatted("<!--{}-->", node.get("data"sv).as_string());
|
||||
return DeprecatedString::formatted("<!--{}-->", node.get("data"sv).as_string());
|
||||
if (type != "element")
|
||||
return node_name;
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
#include "OutOfProcessWebView.h"
|
||||
#include "WebContentClient.h"
|
||||
#include <AK/String.h>
|
||||
#include <AK/DeprecatedString.h>
|
||||
#include <LibFileSystemAccessClient/Client.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/Desktop.h>
|
||||
|
|
@ -240,7 +240,7 @@ void OutOfProcessWebView::notify_server_did_layout(Badge<WebContentClient>, Gfx:
|
|||
set_content_size(content_size);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_change_title(Badge<WebContentClient>, String const& title)
|
||||
void OutOfProcessWebView::notify_server_did_change_title(Badge<WebContentClient>, DeprecatedString const& title)
|
||||
{
|
||||
if (on_title_change)
|
||||
on_title_change(title);
|
||||
|
|
@ -263,7 +263,7 @@ void OutOfProcessWebView::notify_server_did_request_scroll_into_view(Badge<WebCo
|
|||
scroll_into_view(rect, true, true);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint const&, String const& title)
|
||||
void OutOfProcessWebView::notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint const&, DeprecatedString const& title)
|
||||
{
|
||||
GUI::Application::the()->show_tooltip(title, nullptr);
|
||||
}
|
||||
|
|
@ -286,13 +286,13 @@ void OutOfProcessWebView::notify_server_did_unhover_link(Badge<WebContentClient>
|
|||
on_link_hover({});
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_click_link(Badge<WebContentClient>, const AK::URL& url, String const& target, unsigned int modifiers)
|
||||
void OutOfProcessWebView::notify_server_did_click_link(Badge<WebContentClient>, const AK::URL& url, DeprecatedString const& target, unsigned int modifiers)
|
||||
{
|
||||
if (on_link_click)
|
||||
on_link_click(url, target, modifiers);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_middle_click_link(Badge<WebContentClient>, const AK::URL& url, String const& target, unsigned int modifiers)
|
||||
void OutOfProcessWebView::notify_server_did_middle_click_link(Badge<WebContentClient>, const AK::URL& url, DeprecatedString const& target, unsigned int modifiers)
|
||||
{
|
||||
if (on_link_middle_click)
|
||||
on_link_middle_click(url, target, modifiers);
|
||||
|
|
@ -336,19 +336,19 @@ void OutOfProcessWebView::notify_server_did_request_context_menu(Badge<WebConten
|
|||
on_context_menu_request(screen_relative_rect().location().translated(to_widget_position(content_position)));
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_link_context_menu(Badge<WebContentClient>, Gfx::IntPoint const& content_position, const AK::URL& url, String const&, unsigned)
|
||||
void OutOfProcessWebView::notify_server_did_request_link_context_menu(Badge<WebContentClient>, Gfx::IntPoint const& content_position, const AK::URL& url, DeprecatedString const&, unsigned)
|
||||
{
|
||||
if (on_link_context_menu_request)
|
||||
on_link_context_menu_request(url, screen_relative_rect().location().translated(to_widget_position(content_position)));
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_image_context_menu(Badge<WebContentClient>, Gfx::IntPoint const& content_position, const AK::URL& url, String const&, unsigned, Gfx::ShareableBitmap const& bitmap)
|
||||
void OutOfProcessWebView::notify_server_did_request_image_context_menu(Badge<WebContentClient>, Gfx::IntPoint const& content_position, const AK::URL& url, DeprecatedString const&, unsigned, Gfx::ShareableBitmap const& bitmap)
|
||||
{
|
||||
if (on_image_context_menu_request)
|
||||
on_image_context_menu_request(url, screen_relative_rect().location().translated(to_widget_position(content_position)), bitmap);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_alert(Badge<WebContentClient>, String const& message)
|
||||
void OutOfProcessWebView::notify_server_did_request_alert(Badge<WebContentClient>, DeprecatedString const& message)
|
||||
{
|
||||
m_dialog = GUI::MessageBox::construct(window(), message, "Alert"sv, GUI::MessageBox::Type::Information, GUI::MessageBox::InputType::OK);
|
||||
m_dialog->set_icon(window()->icon());
|
||||
|
|
@ -358,7 +358,7 @@ void OutOfProcessWebView::notify_server_did_request_alert(Badge<WebContentClient
|
|||
m_dialog = nullptr;
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_confirm(Badge<WebContentClient>, String const& message)
|
||||
void OutOfProcessWebView::notify_server_did_request_confirm(Badge<WebContentClient>, DeprecatedString const& message)
|
||||
{
|
||||
m_dialog = GUI::MessageBox::construct(window(), message, "Confirm"sv, GUI::MessageBox::Type::Warning, GUI::MessageBox::InputType::OKCancel);
|
||||
m_dialog->set_icon(window()->icon());
|
||||
|
|
@ -367,7 +367,7 @@ void OutOfProcessWebView::notify_server_did_request_confirm(Badge<WebContentClie
|
|||
m_dialog = nullptr;
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_prompt(Badge<WebContentClient>, String const& message, String const& default_)
|
||||
void OutOfProcessWebView::notify_server_did_request_prompt(Badge<WebContentClient>, DeprecatedString const& message, DeprecatedString const& default_)
|
||||
{
|
||||
m_dialog = GUI::InputBox::construct(window(), default_, message, "Prompt"sv, StringView {}, GUI::InputType::Text);
|
||||
m_dialog->set_icon(window()->icon());
|
||||
|
|
@ -380,7 +380,7 @@ void OutOfProcessWebView::notify_server_did_request_prompt(Badge<WebContentClien
|
|||
m_dialog = nullptr;
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_set_prompt_text(Badge<WebContentClient>, String const& message)
|
||||
void OutOfProcessWebView::notify_server_did_request_set_prompt_text(Badge<WebContentClient>, DeprecatedString const& message)
|
||||
{
|
||||
if (m_dialog && is<GUI::InputBox>(*m_dialog))
|
||||
static_cast<GUI::InputBox&>(*m_dialog).set_text_value(message);
|
||||
|
|
@ -398,19 +398,19 @@ void OutOfProcessWebView::notify_server_did_request_dismiss_dialog(Badge<WebCont
|
|||
m_dialog->done(GUI::Dialog::ExecResult::Cancel);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_get_source(const AK::URL& url, String const& source)
|
||||
void OutOfProcessWebView::notify_server_did_get_source(const AK::URL& url, DeprecatedString const& source)
|
||||
{
|
||||
if (on_get_source)
|
||||
on_get_source(url, source);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_get_dom_tree(String const& dom_tree)
|
||||
void OutOfProcessWebView::notify_server_did_get_dom_tree(DeprecatedString const& dom_tree)
|
||||
{
|
||||
if (on_get_dom_tree)
|
||||
on_get_dom_tree(dom_tree);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_get_dom_node_properties(i32 node_id, String const& specified_style, String const& computed_style, String const& custom_properties, String const& node_box_sizing)
|
||||
void OutOfProcessWebView::notify_server_did_get_dom_node_properties(i32 node_id, DeprecatedString const& specified_style, DeprecatedString const& computed_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing)
|
||||
{
|
||||
if (on_get_dom_node_properties)
|
||||
on_get_dom_node_properties(node_id, specified_style, computed_style, custom_properties, node_box_sizing);
|
||||
|
|
@ -422,7 +422,7 @@ void OutOfProcessWebView::notify_server_did_output_js_console_message(i32 messag
|
|||
on_js_console_new_message(message_index);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_get_js_console_messages(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages)
|
||||
void OutOfProcessWebView::notify_server_did_get_js_console_messages(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages)
|
||||
{
|
||||
if (on_get_js_console_messages)
|
||||
on_get_js_console_messages(start_index, message_types, messages);
|
||||
|
|
@ -441,14 +441,14 @@ Vector<Web::Cookie::Cookie> OutOfProcessWebView::notify_server_did_request_all_c
|
|||
return {};
|
||||
}
|
||||
|
||||
Optional<Web::Cookie::Cookie> OutOfProcessWebView::notify_server_did_request_named_cookie(Badge<WebContentClient>, AK::URL const& url, String const& name)
|
||||
Optional<Web::Cookie::Cookie> OutOfProcessWebView::notify_server_did_request_named_cookie(Badge<WebContentClient>, AK::URL const& url, DeprecatedString const& name)
|
||||
{
|
||||
if (on_get_named_cookie)
|
||||
return on_get_named_cookie(url, name);
|
||||
return {};
|
||||
}
|
||||
|
||||
String OutOfProcessWebView::notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source)
|
||||
DeprecatedString OutOfProcessWebView::notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source)
|
||||
{
|
||||
if (on_get_cookie)
|
||||
return on_get_cookie(url, source);
|
||||
|
|
@ -514,7 +514,7 @@ Gfx::IntRect OutOfProcessWebView::notify_server_did_request_fullscreen_window()
|
|||
return {};
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::notify_server_did_request_file(Badge<WebContentClient>, String const& path, i32 request_id)
|
||||
void OutOfProcessWebView::notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32 request_id)
|
||||
{
|
||||
auto file = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window(), path);
|
||||
if (file.is_error())
|
||||
|
|
@ -550,7 +550,7 @@ WebContentClient& OutOfProcessWebView::client()
|
|||
return *m_client_state.client;
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::debug_request(String const& request, String const& argument)
|
||||
void OutOfProcessWebView::debug_request(DeprecatedString const& request, DeprecatedString const& argument)
|
||||
{
|
||||
client().async_debug_request(request, argument);
|
||||
}
|
||||
|
|
@ -588,7 +588,7 @@ i32 OutOfProcessWebView::get_hovered_node_id()
|
|||
return client().get_hovered_node_id();
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::js_console_input(String const& js_source)
|
||||
void OutOfProcessWebView::js_console_input(DeprecatedString const& js_source)
|
||||
{
|
||||
client().async_js_console_input(js_source);
|
||||
}
|
||||
|
|
@ -603,7 +603,7 @@ void OutOfProcessWebView::run_javascript(StringView js_source)
|
|||
client().async_run_javascript(js_source);
|
||||
}
|
||||
|
||||
String OutOfProcessWebView::selected_text()
|
||||
DeprecatedString OutOfProcessWebView::selected_text()
|
||||
{
|
||||
return client().get_selected_text();
|
||||
}
|
||||
|
|
@ -613,27 +613,27 @@ void OutOfProcessWebView::select_all()
|
|||
client().async_select_all();
|
||||
}
|
||||
|
||||
String OutOfProcessWebView::dump_layout_tree()
|
||||
DeprecatedString OutOfProcessWebView::dump_layout_tree()
|
||||
{
|
||||
return client().dump_layout_tree();
|
||||
}
|
||||
|
||||
OrderedHashMap<String, String> OutOfProcessWebView::get_local_storage_entries()
|
||||
OrderedHashMap<DeprecatedString, DeprecatedString> OutOfProcessWebView::get_local_storage_entries()
|
||||
{
|
||||
return client().get_local_storage_entries();
|
||||
}
|
||||
|
||||
OrderedHashMap<String, String> OutOfProcessWebView::get_session_storage_entries()
|
||||
OrderedHashMap<DeprecatedString, DeprecatedString> OutOfProcessWebView::get_session_storage_entries()
|
||||
{
|
||||
return client().get_session_storage_entries();
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::set_content_filters(Vector<String> filters)
|
||||
void OutOfProcessWebView::set_content_filters(Vector<DeprecatedString> filters)
|
||||
{
|
||||
client().async_set_content_filters(filters);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::set_proxy_mappings(Vector<String> proxies, HashMap<String, size_t> mappings)
|
||||
void OutOfProcessWebView::set_proxy_mappings(Vector<DeprecatedString> proxies, HashMap<DeprecatedString, size_t> mappings)
|
||||
{
|
||||
client().async_set_proxy_mappings(move(proxies), move(mappings));
|
||||
}
|
||||
|
|
@ -643,7 +643,7 @@ void OutOfProcessWebView::set_preferred_color_scheme(Web::CSS::PreferredColorSch
|
|||
client().async_set_preferred_color_scheme(color_scheme);
|
||||
}
|
||||
|
||||
void OutOfProcessWebView::connect_to_webdriver(String const& webdriver_ipc_path)
|
||||
void OutOfProcessWebView::connect_to_webdriver(DeprecatedString const& webdriver_ipc_path)
|
||||
{
|
||||
client().async_connect_to_webdriver(webdriver_ipc_path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,37 +39,37 @@ public:
|
|||
void load_html(StringView, const AK::URL&);
|
||||
void load_empty_document();
|
||||
|
||||
void debug_request(String const& request, String const& argument = {});
|
||||
void debug_request(DeprecatedString const& request, DeprecatedString const& argument = {});
|
||||
void get_source();
|
||||
|
||||
void inspect_dom_tree();
|
||||
struct DOMNodeProperties {
|
||||
String specified_values_json;
|
||||
String computed_values_json;
|
||||
String custom_properties_json;
|
||||
String node_box_sizing_json;
|
||||
DeprecatedString specified_values_json;
|
||||
DeprecatedString computed_values_json;
|
||||
DeprecatedString custom_properties_json;
|
||||
DeprecatedString node_box_sizing_json;
|
||||
};
|
||||
Optional<DOMNodeProperties> inspect_dom_node(i32 node_id, Optional<Web::CSS::Selector::PseudoElement>);
|
||||
void clear_inspected_dom_node();
|
||||
i32 get_hovered_node_id();
|
||||
|
||||
void js_console_input(String const& js_source);
|
||||
void js_console_input(DeprecatedString const& js_source);
|
||||
void js_console_request_messages(i32 start_index);
|
||||
|
||||
void run_javascript(StringView);
|
||||
|
||||
String selected_text();
|
||||
DeprecatedString selected_text();
|
||||
void select_all();
|
||||
|
||||
String dump_layout_tree();
|
||||
DeprecatedString dump_layout_tree();
|
||||
|
||||
OrderedHashMap<String, String> get_local_storage_entries();
|
||||
OrderedHashMap<String, String> get_session_storage_entries();
|
||||
OrderedHashMap<DeprecatedString, DeprecatedString> get_local_storage_entries();
|
||||
OrderedHashMap<DeprecatedString, DeprecatedString> get_session_storage_entries();
|
||||
|
||||
void set_content_filters(Vector<String>);
|
||||
void set_proxy_mappings(Vector<String> proxies, HashMap<String, size_t> mappings);
|
||||
void set_content_filters(Vector<DeprecatedString>);
|
||||
void set_proxy_mappings(Vector<DeprecatedString> proxies, HashMap<DeprecatedString, size_t> mappings);
|
||||
void set_preferred_color_scheme(Web::CSS::PreferredColorScheme);
|
||||
void connect_to_webdriver(String const& webdriver_ipc_path);
|
||||
void connect_to_webdriver(DeprecatedString const& webdriver_ipc_path);
|
||||
|
||||
void set_window_position(Gfx::IntPoint const&);
|
||||
void set_window_size(Gfx::IntSize const&);
|
||||
|
|
@ -80,12 +80,12 @@ public:
|
|||
Gfx::ShareableBitmap take_document_screenshot();
|
||||
|
||||
Function<void(Gfx::IntPoint const& screen_position)> on_context_menu_request;
|
||||
Function<void(const AK::URL&, String const& target, unsigned modifiers)> on_link_click;
|
||||
Function<void(const AK::URL&, DeprecatedString const& target, unsigned modifiers)> on_link_click;
|
||||
Function<void(const AK::URL&, Gfx::IntPoint const& screen_position)> on_link_context_menu_request;
|
||||
Function<void(const AK::URL&, Gfx::IntPoint const& screen_position, Gfx::ShareableBitmap const&)> on_image_context_menu_request;
|
||||
Function<void(const AK::URL&, String const& target, unsigned modifiers)> on_link_middle_click;
|
||||
Function<void(const AK::URL&, DeprecatedString const& target, unsigned modifiers)> on_link_middle_click;
|
||||
Function<void(const AK::URL&)> on_link_hover;
|
||||
Function<void(String const&)> on_title_change;
|
||||
Function<void(DeprecatedString const&)> on_title_change;
|
||||
Function<void(const AK::URL&, bool)> on_load_start;
|
||||
Function<void(const AK::URL&)> on_load_finish;
|
||||
Function<void()> on_navigate_back;
|
||||
|
|
@ -94,14 +94,14 @@ public:
|
|||
Function<void(Gfx::Bitmap const&)> on_favicon_change;
|
||||
Function<void(const AK::URL&)> on_url_drop;
|
||||
Function<void(Web::DOM::Document*)> on_set_document;
|
||||
Function<void(const AK::URL&, String const&)> on_get_source;
|
||||
Function<void(String const&)> on_get_dom_tree;
|
||||
Function<void(i32 node_id, String const& specified_style, String const& computed_style, String const& custom_properties, String const& node_box_sizing)> on_get_dom_node_properties;
|
||||
Function<void(const AK::URL&, DeprecatedString const&)> on_get_source;
|
||||
Function<void(DeprecatedString const&)> on_get_dom_tree;
|
||||
Function<void(i32 node_id, DeprecatedString const& specified_style, DeprecatedString const& computed_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing)> on_get_dom_node_properties;
|
||||
Function<void(i32 message_id)> on_js_console_new_message;
|
||||
Function<void(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages)> on_get_js_console_messages;
|
||||
Function<void(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages)> on_get_js_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<Optional<Web::Cookie::Cookie>(AK::URL const& url, DeprecatedString const& name)> on_get_named_cookie;
|
||||
Function<DeprecatedString(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<void(AK::URL const& url, Web::Cookie::Cookie const& cookie)> on_update_cookie;
|
||||
Function<void(i32 count_waiting)> on_resource_status_change;
|
||||
|
|
@ -141,39 +141,39 @@ private:
|
|||
virtual void notify_server_did_invalidate_content_rect(Badge<WebContentClient>, Gfx::IntRect const&) override;
|
||||
virtual void notify_server_did_change_selection(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_request_cursor_change(Badge<WebContentClient>, Gfx::StandardCursor cursor) override;
|
||||
virtual void notify_server_did_change_title(Badge<WebContentClient>, String const&) override;
|
||||
virtual void notify_server_did_change_title(Badge<WebContentClient>, DeprecatedString const&) override;
|
||||
virtual void notify_server_did_request_scroll(Badge<WebContentClient>, i32, i32) override;
|
||||
virtual void notify_server_did_request_scroll_to(Badge<WebContentClient>, Gfx::IntPoint const&) override;
|
||||
virtual void notify_server_did_request_scroll_into_view(Badge<WebContentClient>, Gfx::IntRect const&) override;
|
||||
virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint const&, String const&) override;
|
||||
virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint const&, DeprecatedString const&) override;
|
||||
virtual void notify_server_did_leave_tooltip_area(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_hover_link(Badge<WebContentClient>, const AK::URL&) override;
|
||||
virtual void notify_server_did_unhover_link(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_click_link(Badge<WebContentClient>, const AK::URL&, String const& target, unsigned modifiers) override;
|
||||
virtual void notify_server_did_middle_click_link(Badge<WebContentClient>, const AK::URL&, String const& target, unsigned modifiers) override;
|
||||
virtual void notify_server_did_click_link(Badge<WebContentClient>, const AK::URL&, DeprecatedString const& target, unsigned modifiers) override;
|
||||
virtual void notify_server_did_middle_click_link(Badge<WebContentClient>, const AK::URL&, DeprecatedString const& target, unsigned modifiers) override;
|
||||
virtual void notify_server_did_start_loading(Badge<WebContentClient>, const AK::URL&, bool) override;
|
||||
virtual void notify_server_did_finish_loading(Badge<WebContentClient>, const AK::URL&) override;
|
||||
virtual void notify_server_did_request_navigate_back(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_request_navigate_forward(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_request_refresh(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_request_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&) override;
|
||||
virtual void notify_server_did_request_link_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, String const& target, unsigned modifiers) override;
|
||||
virtual void notify_server_did_request_image_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, String const& target, unsigned modifiers, Gfx::ShareableBitmap const&) override;
|
||||
virtual void notify_server_did_request_alert(Badge<WebContentClient>, String const& message) override;
|
||||
virtual void notify_server_did_request_confirm(Badge<WebContentClient>, String const& message) override;
|
||||
virtual void notify_server_did_request_prompt(Badge<WebContentClient>, String const& message, String const& default_) override;
|
||||
virtual void notify_server_did_request_set_prompt_text(Badge<WebContentClient>, String const& message) override;
|
||||
virtual void notify_server_did_request_link_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, DeprecatedString const& target, unsigned modifiers) override;
|
||||
virtual void notify_server_did_request_image_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, DeprecatedString const& target, unsigned modifiers, Gfx::ShareableBitmap const&) override;
|
||||
virtual void notify_server_did_request_alert(Badge<WebContentClient>, DeprecatedString const& message) override;
|
||||
virtual void notify_server_did_request_confirm(Badge<WebContentClient>, DeprecatedString const& message) override;
|
||||
virtual void notify_server_did_request_prompt(Badge<WebContentClient>, DeprecatedString const& message, DeprecatedString const& default_) override;
|
||||
virtual void notify_server_did_request_set_prompt_text(Badge<WebContentClient>, DeprecatedString const& message) override;
|
||||
virtual void notify_server_did_request_accept_dialog(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_request_dismiss_dialog(Badge<WebContentClient>) override;
|
||||
virtual void notify_server_did_get_source(const AK::URL& url, String const& source) override;
|
||||
virtual void notify_server_did_get_dom_tree(String const& dom_tree) override;
|
||||
virtual void notify_server_did_get_dom_node_properties(i32 node_id, String const& specified_style, String const& computed_style, String const& custom_properties, String const& node_box_sizing) override;
|
||||
virtual void notify_server_did_get_source(const AK::URL& url, DeprecatedString const& source) override;
|
||||
virtual void notify_server_did_get_dom_tree(DeprecatedString const& dom_tree) override;
|
||||
virtual void notify_server_did_get_dom_node_properties(i32 node_id, DeprecatedString const& specified_style, DeprecatedString const& computed_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing) override;
|
||||
virtual void notify_server_did_output_js_console_message(i32 message_index) override;
|
||||
virtual void notify_server_did_get_js_console_messages(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages) override;
|
||||
virtual void notify_server_did_get_js_console_messages(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages) override;
|
||||
virtual void notify_server_did_change_favicon(Gfx::Bitmap const& favicon) override;
|
||||
virtual Vector<Web::Cookie::Cookie> notify_server_did_request_all_cookies(Badge<WebContentClient>, AK::URL const& url) override;
|
||||
virtual Optional<Web::Cookie::Cookie> notify_server_did_request_named_cookie(Badge<WebContentClient>, AK::URL const& url, String const& name) override;
|
||||
virtual String notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source) override;
|
||||
virtual Optional<Web::Cookie::Cookie> notify_server_did_request_named_cookie(Badge<WebContentClient>, AK::URL const& url, DeprecatedString const& name) override;
|
||||
virtual DeprecatedString notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source) override;
|
||||
virtual void notify_server_did_set_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source) override;
|
||||
virtual void notify_server_did_update_cookie(Badge<WebContentClient>, AK::URL const& url, Web::Cookie::Cookie const& cookie) override;
|
||||
virtual void notify_server_did_update_resource_count(i32 count_waiting) override;
|
||||
|
|
@ -183,7 +183,7 @@ private:
|
|||
virtual Gfx::IntRect notify_server_did_request_maximize_window() override;
|
||||
virtual Gfx::IntRect notify_server_did_request_minimize_window() override;
|
||||
virtual Gfx::IntRect notify_server_did_request_fullscreen_window() override;
|
||||
virtual void notify_server_did_request_file(Badge<WebContentClient>, String const& path, i32) override;
|
||||
virtual void notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32) override;
|
||||
virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) override;
|
||||
|
||||
void request_repaint();
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ RequestServerAdapter::RequestServerAdapter(NonnullRefPtr<Protocol::RequestClient
|
|||
|
||||
RequestServerAdapter::~RequestServerAdapter() = default;
|
||||
|
||||
RefPtr<Web::ResourceLoaderConnectorRequest> RequestServerAdapter::start_request(String const& method, URL const& url, HashMap<String, String> const& headers, ReadonlyBytes body, Core::ProxyData const& proxy)
|
||||
RefPtr<Web::ResourceLoaderConnectorRequest> RequestServerAdapter::start_request(DeprecatedString const& method, URL const& url, HashMap<DeprecatedString, DeprecatedString> const& headers, ReadonlyBytes body, Core::ProxyData const& proxy)
|
||||
{
|
||||
auto protocol_request = m_protocol_client->start_request(method, url, headers, body, proxy);
|
||||
if (!protocol_request)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public:
|
|||
virtual void prefetch_dns(AK::URL const& url) override;
|
||||
virtual void preconnect(AK::URL const& url) override;
|
||||
|
||||
virtual RefPtr<Web::ResourceLoaderConnectorRequest> start_request(String const& method, URL const&, HashMap<String, String> const& request_headers = {}, ReadonlyBytes request_body = {}, Core::ProxyData const& = {}) override;
|
||||
virtual RefPtr<Web::ResourceLoaderConnectorRequest> start_request(DeprecatedString const& method, URL const&, HashMap<DeprecatedString, DeprecatedString> const& request_headers = {}, ReadonlyBytes request_body = {}, Core::ProxyData const& = {}) override;
|
||||
|
||||
private:
|
||||
RequestServerAdapter(NonnullRefPtr<Protocol::RequestClient> protocol_client);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ int StylePropertiesModel::row_count(GUI::ModelIndex const&) const
|
|||
return m_values.size();
|
||||
}
|
||||
|
||||
String StylePropertiesModel::column_name(int column_index) const
|
||||
DeprecatedString StylePropertiesModel::column_name(int column_index) const
|
||||
{
|
||||
switch (column_index) {
|
||||
case Column::PropertyName:
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ public:
|
|||
|
||||
virtual int row_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override;
|
||||
virtual int column_count(GUI::ModelIndex const& = GUI::ModelIndex()) const override { return Column::__Count; }
|
||||
virtual String column_name(int) const override;
|
||||
virtual DeprecatedString column_name(int) const override;
|
||||
virtual GUI::Variant data(GUI::ModelIndex const&, GUI::ModelRole) const override;
|
||||
virtual bool is_searchable() const override { return true; }
|
||||
virtual Vector<GUI::ModelIndex> matches(StringView, unsigned flags, GUI::ModelIndex const&) override;
|
||||
|
|
@ -42,8 +42,8 @@ private:
|
|||
JsonObject m_properties;
|
||||
|
||||
struct Value {
|
||||
String name;
|
||||
String value;
|
||||
DeprecatedString name;
|
||||
DeprecatedString value;
|
||||
};
|
||||
Vector<Value> m_values;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -23,39 +23,39 @@ public:
|
|||
virtual void notify_server_did_invalidate_content_rect(Badge<WebContentClient>, Gfx::IntRect const&) = 0;
|
||||
virtual void notify_server_did_change_selection(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_request_cursor_change(Badge<WebContentClient>, Gfx::StandardCursor cursor) = 0;
|
||||
virtual void notify_server_did_change_title(Badge<WebContentClient>, String const&) = 0;
|
||||
virtual void notify_server_did_change_title(Badge<WebContentClient>, DeprecatedString const&) = 0;
|
||||
virtual void notify_server_did_request_scroll(Badge<WebContentClient>, i32, i32) = 0;
|
||||
virtual void notify_server_did_request_scroll_to(Badge<WebContentClient>, Gfx::IntPoint const&) = 0;
|
||||
virtual void notify_server_did_request_scroll_into_view(Badge<WebContentClient>, Gfx::IntRect const&) = 0;
|
||||
virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint const&, String const&) = 0;
|
||||
virtual void notify_server_did_enter_tooltip_area(Badge<WebContentClient>, Gfx::IntPoint const&, DeprecatedString const&) = 0;
|
||||
virtual void notify_server_did_leave_tooltip_area(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_hover_link(Badge<WebContentClient>, const AK::URL&) = 0;
|
||||
virtual void notify_server_did_unhover_link(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_click_link(Badge<WebContentClient>, const AK::URL&, String const& target, unsigned modifiers) = 0;
|
||||
virtual void notify_server_did_middle_click_link(Badge<WebContentClient>, const AK::URL&, String const& target, unsigned modifiers) = 0;
|
||||
virtual void notify_server_did_click_link(Badge<WebContentClient>, const AK::URL&, DeprecatedString const& target, unsigned modifiers) = 0;
|
||||
virtual void notify_server_did_middle_click_link(Badge<WebContentClient>, const AK::URL&, DeprecatedString const& target, unsigned modifiers) = 0;
|
||||
virtual void notify_server_did_start_loading(Badge<WebContentClient>, const AK::URL&, bool is_redirect) = 0;
|
||||
virtual void notify_server_did_finish_loading(Badge<WebContentClient>, const AK::URL&) = 0;
|
||||
virtual void notify_server_did_request_navigate_back(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_request_navigate_forward(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_request_refresh(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_request_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&) = 0;
|
||||
virtual void notify_server_did_request_link_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, String const& target, unsigned modifiers) = 0;
|
||||
virtual void notify_server_did_request_image_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, String const& target, unsigned modifiers, Gfx::ShareableBitmap const&) = 0;
|
||||
virtual void notify_server_did_request_alert(Badge<WebContentClient>, String const& message) = 0;
|
||||
virtual void notify_server_did_request_confirm(Badge<WebContentClient>, String const& message) = 0;
|
||||
virtual void notify_server_did_request_prompt(Badge<WebContentClient>, String const& message, String const& default_) = 0;
|
||||
virtual void notify_server_did_request_set_prompt_text(Badge<WebContentClient>, String const& message) = 0;
|
||||
virtual void notify_server_did_request_link_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, DeprecatedString const& target, unsigned modifiers) = 0;
|
||||
virtual void notify_server_did_request_image_context_menu(Badge<WebContentClient>, Gfx::IntPoint const&, const AK::URL&, DeprecatedString const& target, unsigned modifiers, Gfx::ShareableBitmap const&) = 0;
|
||||
virtual void notify_server_did_request_alert(Badge<WebContentClient>, DeprecatedString const& message) = 0;
|
||||
virtual void notify_server_did_request_confirm(Badge<WebContentClient>, DeprecatedString const& message) = 0;
|
||||
virtual void notify_server_did_request_prompt(Badge<WebContentClient>, DeprecatedString const& message, DeprecatedString const& default_) = 0;
|
||||
virtual void notify_server_did_request_set_prompt_text(Badge<WebContentClient>, DeprecatedString const& message) = 0;
|
||||
virtual void notify_server_did_request_accept_dialog(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_request_dismiss_dialog(Badge<WebContentClient>) = 0;
|
||||
virtual void notify_server_did_get_source(const AK::URL& url, String const& source) = 0;
|
||||
virtual void notify_server_did_get_dom_tree(String const& dom_tree) = 0;
|
||||
virtual void notify_server_did_get_dom_node_properties(i32 node_id, String const& specified_style, String const& computed_style, String const& custom_properties, String const& node_box_sizing) = 0;
|
||||
virtual void notify_server_did_get_source(const AK::URL& url, DeprecatedString const& source) = 0;
|
||||
virtual void notify_server_did_get_dom_tree(DeprecatedString const& dom_tree) = 0;
|
||||
virtual void notify_server_did_get_dom_node_properties(i32 node_id, DeprecatedString const& specified_style, DeprecatedString const& computed_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing) = 0;
|
||||
virtual void notify_server_did_output_js_console_message(i32 message_index) = 0;
|
||||
virtual void notify_server_did_get_js_console_messages(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages) = 0;
|
||||
virtual void notify_server_did_get_js_console_messages(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages) = 0;
|
||||
virtual void notify_server_did_change_favicon(Gfx::Bitmap const& favicon) = 0;
|
||||
virtual Vector<Web::Cookie::Cookie> notify_server_did_request_all_cookies(Badge<WebContentClient>, AK::URL const& url) = 0;
|
||||
virtual Optional<Web::Cookie::Cookie> notify_server_did_request_named_cookie(Badge<WebContentClient>, AK::URL const& url, String const& name) = 0;
|
||||
virtual String notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source) = 0;
|
||||
virtual Optional<Web::Cookie::Cookie> notify_server_did_request_named_cookie(Badge<WebContentClient>, AK::URL const& url, DeprecatedString const& name) = 0;
|
||||
virtual DeprecatedString notify_server_did_request_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::Source source) = 0;
|
||||
virtual void notify_server_did_set_cookie(Badge<WebContentClient>, const AK::URL& url, Web::Cookie::ParsedCookie const& cookie, Web::Cookie::Source source) = 0;
|
||||
virtual void notify_server_did_update_cookie(Badge<WebContentClient>, AK::URL const& url, Web::Cookie::Cookie const& cookie) = 0;
|
||||
virtual void notify_server_did_update_resource_count(i32 count_waiting) = 0;
|
||||
|
|
@ -65,7 +65,7 @@ public:
|
|||
virtual Gfx::IntRect notify_server_did_request_maximize_window() = 0;
|
||||
virtual Gfx::IntRect notify_server_did_request_minimize_window() = 0;
|
||||
virtual Gfx::IntRect notify_server_did_request_fullscreen_window() = 0;
|
||||
virtual void notify_server_did_request_file(Badge<WebContentClient>, String const& path, i32) = 0;
|
||||
virtual void notify_server_did_request_file(Badge<WebContentClient>, DeprecatedString const& path, i32) = 0;
|
||||
virtual void notify_server_did_finish_handling_input_event(bool event_was_accepted) = 0;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -77,7 +77,7 @@ void WebContentClient::did_layout(Gfx::IntSize const& content_size)
|
|||
m_view.notify_server_did_layout({}, content_size);
|
||||
}
|
||||
|
||||
void WebContentClient::did_change_title(String const& title)
|
||||
void WebContentClient::did_change_title(DeprecatedString const& title)
|
||||
{
|
||||
dbgln_if(SPAM_DEBUG, "handle: WebContentClient::DidChangeTitle! title={}", title);
|
||||
m_view.notify_server_did_change_title({}, title);
|
||||
|
|
@ -99,7 +99,7 @@ void WebContentClient::did_request_scroll_into_view(Gfx::IntRect const& rect)
|
|||
m_view.notify_server_did_request_scroll_into_view({}, rect);
|
||||
}
|
||||
|
||||
void WebContentClient::did_enter_tooltip_area(Gfx::IntPoint const& content_position, String const& title)
|
||||
void WebContentClient::did_enter_tooltip_area(Gfx::IntPoint const& content_position, DeprecatedString const& title)
|
||||
{
|
||||
m_view.notify_server_did_enter_tooltip_area({}, content_position, title);
|
||||
}
|
||||
|
|
@ -121,12 +121,12 @@ void WebContentClient::did_unhover_link()
|
|||
m_view.notify_server_did_unhover_link({});
|
||||
}
|
||||
|
||||
void WebContentClient::did_click_link(AK::URL const& url, String const& target, unsigned modifiers)
|
||||
void WebContentClient::did_click_link(AK::URL const& url, DeprecatedString const& target, unsigned modifiers)
|
||||
{
|
||||
m_view.notify_server_did_click_link({}, url, target, modifiers);
|
||||
}
|
||||
|
||||
void WebContentClient::did_middle_click_link(AK::URL const& url, String const& target, unsigned modifiers)
|
||||
void WebContentClient::did_middle_click_link(AK::URL const& url, DeprecatedString const& target, unsigned modifiers)
|
||||
{
|
||||
m_view.notify_server_did_middle_click_link({}, url, target, modifiers);
|
||||
}
|
||||
|
|
@ -141,27 +141,27 @@ void WebContentClient::did_request_context_menu(Gfx::IntPoint const& content_pos
|
|||
m_view.notify_server_did_request_context_menu({}, content_position);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_link_context_menu(Gfx::IntPoint const& content_position, AK::URL const& url, String const& target, unsigned modifiers)
|
||||
void WebContentClient::did_request_link_context_menu(Gfx::IntPoint const& content_position, AK::URL const& url, DeprecatedString const& target, unsigned modifiers)
|
||||
{
|
||||
m_view.notify_server_did_request_link_context_menu({}, content_position, url, target, modifiers);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_image_context_menu(Gfx::IntPoint const& content_position, AK::URL const& url, String const& target, unsigned modifiers, Gfx::ShareableBitmap const& bitmap)
|
||||
void WebContentClient::did_request_image_context_menu(Gfx::IntPoint const& content_position, AK::URL const& url, DeprecatedString const& target, unsigned modifiers, Gfx::ShareableBitmap const& bitmap)
|
||||
{
|
||||
m_view.notify_server_did_request_image_context_menu({}, content_position, url, target, modifiers, bitmap);
|
||||
}
|
||||
|
||||
void WebContentClient::did_get_source(AK::URL const& url, String const& source)
|
||||
void WebContentClient::did_get_source(AK::URL const& url, DeprecatedString const& source)
|
||||
{
|
||||
m_view.notify_server_did_get_source(url, source);
|
||||
}
|
||||
|
||||
void WebContentClient::did_get_dom_tree(String const& dom_tree)
|
||||
void WebContentClient::did_get_dom_tree(DeprecatedString const& dom_tree)
|
||||
{
|
||||
m_view.notify_server_did_get_dom_tree(dom_tree);
|
||||
}
|
||||
|
||||
void WebContentClient::did_get_dom_node_properties(i32 node_id, String const& specified_style, String const& computed_style, String const& custom_properties, String const& node_box_sizing)
|
||||
void WebContentClient::did_get_dom_node_properties(i32 node_id, DeprecatedString const& specified_style, DeprecatedString const& computed_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing)
|
||||
{
|
||||
m_view.notify_server_did_get_dom_node_properties(node_id, specified_style, computed_style, custom_properties, node_box_sizing);
|
||||
}
|
||||
|
|
@ -171,27 +171,27 @@ void WebContentClient::did_output_js_console_message(i32 message_index)
|
|||
m_view.notify_server_did_output_js_console_message(message_index);
|
||||
}
|
||||
|
||||
void WebContentClient::did_get_js_console_messages(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages)
|
||||
void WebContentClient::did_get_js_console_messages(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages)
|
||||
{
|
||||
m_view.notify_server_did_get_js_console_messages(start_index, message_types, messages);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_alert(String const& message)
|
||||
void WebContentClient::did_request_alert(DeprecatedString const& message)
|
||||
{
|
||||
m_view.notify_server_did_request_alert({}, message);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_confirm(String const& message)
|
||||
void WebContentClient::did_request_confirm(DeprecatedString const& message)
|
||||
{
|
||||
m_view.notify_server_did_request_confirm({}, message);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_prompt(String const& message, String const& default_)
|
||||
void WebContentClient::did_request_prompt(DeprecatedString const& message, DeprecatedString const& default_)
|
||||
{
|
||||
m_view.notify_server_did_request_prompt({}, message, default_);
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_set_prompt_text(String const& message)
|
||||
void WebContentClient::did_request_set_prompt_text(DeprecatedString const& message)
|
||||
{
|
||||
m_view.notify_server_did_request_set_prompt_text({}, message);
|
||||
}
|
||||
|
|
@ -220,7 +220,7 @@ Messages::WebContentClient::DidRequestAllCookiesResponse WebContentClient::did_r
|
|||
return m_view.notify_server_did_request_all_cookies({}, url);
|
||||
}
|
||||
|
||||
Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_request_named_cookie(AK::URL const& url, String const& name)
|
||||
Messages::WebContentClient::DidRequestNamedCookieResponse WebContentClient::did_request_named_cookie(AK::URL const& url, DeprecatedString const& name)
|
||||
{
|
||||
return m_view.notify_server_did_request_named_cookie({}, url, name);
|
||||
}
|
||||
|
|
@ -275,7 +275,7 @@ Messages::WebContentClient::DidRequestFullscreenWindowResponse WebContentClient:
|
|||
return m_view.notify_server_did_request_fullscreen_window();
|
||||
}
|
||||
|
||||
void WebContentClient::did_request_file(String const& path, i32 request_id)
|
||||
void WebContentClient::did_request_file(DeprecatedString const& path, i32 request_id)
|
||||
{
|
||||
m_view.notify_server_did_request_file({}, path, request_id);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,34 +37,34 @@ private:
|
|||
virtual void did_change_selection() override;
|
||||
virtual void did_request_cursor_change(i32) override;
|
||||
virtual void did_layout(Gfx::IntSize const&) override;
|
||||
virtual void did_change_title(String const&) override;
|
||||
virtual void did_change_title(DeprecatedString const&) override;
|
||||
virtual void did_request_scroll(i32, i32) override;
|
||||
virtual void did_request_scroll_to(Gfx::IntPoint const&) override;
|
||||
virtual void did_request_scroll_into_view(Gfx::IntRect const&) override;
|
||||
virtual void did_enter_tooltip_area(Gfx::IntPoint const&, String const&) override;
|
||||
virtual void did_enter_tooltip_area(Gfx::IntPoint const&, DeprecatedString const&) override;
|
||||
virtual void did_leave_tooltip_area() override;
|
||||
virtual void did_hover_link(AK::URL const&) override;
|
||||
virtual void did_unhover_link() override;
|
||||
virtual void did_click_link(AK::URL const&, String const&, unsigned) override;
|
||||
virtual void did_middle_click_link(AK::URL const&, String const&, unsigned) override;
|
||||
virtual void did_click_link(AK::URL const&, DeprecatedString const&, unsigned) override;
|
||||
virtual void did_middle_click_link(AK::URL const&, DeprecatedString const&, unsigned) override;
|
||||
virtual void did_start_loading(AK::URL const&, bool) override;
|
||||
virtual void did_request_context_menu(Gfx::IntPoint const&) override;
|
||||
virtual void did_request_link_context_menu(Gfx::IntPoint const&, AK::URL const&, String const&, unsigned) override;
|
||||
virtual void did_request_image_context_menu(Gfx::IntPoint const&, AK::URL const&, String const&, unsigned, Gfx::ShareableBitmap const&) override;
|
||||
virtual void did_get_source(AK::URL const&, String const&) override;
|
||||
virtual void did_get_dom_tree(String const&) override;
|
||||
virtual void did_get_dom_node_properties(i32 node_id, String const& specified_style, String const& computed_style, String const& custom_properties, String const& node_box_sizing) override;
|
||||
virtual void did_request_link_context_menu(Gfx::IntPoint const&, AK::URL const&, DeprecatedString const&, unsigned) override;
|
||||
virtual void did_request_image_context_menu(Gfx::IntPoint const&, AK::URL const&, DeprecatedString const&, unsigned, Gfx::ShareableBitmap const&) override;
|
||||
virtual void did_get_source(AK::URL const&, DeprecatedString const&) override;
|
||||
virtual void did_get_dom_tree(DeprecatedString const&) override;
|
||||
virtual void did_get_dom_node_properties(i32 node_id, DeprecatedString const& specified_style, DeprecatedString const& computed_style, DeprecatedString const& custom_properties, DeprecatedString const& node_box_sizing) override;
|
||||
virtual void did_output_js_console_message(i32 message_index) override;
|
||||
virtual void did_get_js_console_messages(i32 start_index, Vector<String> const& message_types, Vector<String> const& messages) override;
|
||||
virtual void did_get_js_console_messages(i32 start_index, Vector<DeprecatedString> const& message_types, Vector<DeprecatedString> const& messages) override;
|
||||
virtual void did_change_favicon(Gfx::ShareableBitmap const&) override;
|
||||
virtual void did_request_alert(String const&) override;
|
||||
virtual void did_request_confirm(String const&) override;
|
||||
virtual void did_request_prompt(String const&, String const&) override;
|
||||
virtual void did_request_set_prompt_text(String const& message) override;
|
||||
virtual void did_request_alert(DeprecatedString const&) override;
|
||||
virtual void did_request_confirm(DeprecatedString const&) override;
|
||||
virtual void did_request_prompt(DeprecatedString const&, DeprecatedString const&) override;
|
||||
virtual void did_request_set_prompt_text(DeprecatedString const& message) override;
|
||||
virtual void did_request_accept_dialog() override;
|
||||
virtual void did_request_dismiss_dialog() override;
|
||||
virtual Messages::WebContentClient::DidRequestAllCookiesResponse did_request_all_cookies(AK::URL const&) override;
|
||||
virtual Messages::WebContentClient::DidRequestNamedCookieResponse did_request_named_cookie(AK::URL const&, String const&) override;
|
||||
virtual Messages::WebContentClient::DidRequestNamedCookieResponse did_request_named_cookie(AK::URL const&, DeprecatedString const&) override;
|
||||
virtual Messages::WebContentClient::DidRequestCookieResponse did_request_cookie(AK::URL const&, u8) override;
|
||||
virtual void did_set_cookie(AK::URL const&, Web::Cookie::ParsedCookie const&, u8) override;
|
||||
virtual void did_update_cookie(AK::URL const&, Web::Cookie::Cookie const&) override;
|
||||
|
|
@ -75,7 +75,7 @@ private:
|
|||
virtual Messages::WebContentClient::DidRequestMaximizeWindowResponse did_request_maximize_window() override;
|
||||
virtual Messages::WebContentClient::DidRequestMinimizeWindowResponse did_request_minimize_window() override;
|
||||
virtual Messages::WebContentClient::DidRequestFullscreenWindowResponse did_request_fullscreen_window() override;
|
||||
virtual void did_request_file(String const& path, i32) override;
|
||||
virtual void did_request_file(DeprecatedString const& path, i32) override;
|
||||
virtual void did_finish_handling_input_event(bool event_was_accepted) override;
|
||||
|
||||
ViewImplementation& m_view;
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ WebSocketClientSocketAdapter::WebSocketClientSocketAdapter(NonnullRefPtr<Protoco
|
|||
}
|
||||
}
|
||||
};
|
||||
m_websocket->on_close = [weak_this = make_weak_ptr()](u16 code, String reason, bool was_clean) {
|
||||
m_websocket->on_close = [weak_this = make_weak_ptr()](u16 code, DeprecatedString reason, bool was_clean) {
|
||||
if (auto strong_this = weak_this.strong_ref())
|
||||
if (strong_this->on_close)
|
||||
strong_this->on_close(code, move(reason), was_clean);
|
||||
|
|
@ -97,7 +97,7 @@ void WebSocketClientSocketAdapter::send(StringView text_message)
|
|||
m_websocket->send(text_message);
|
||||
}
|
||||
|
||||
void WebSocketClientSocketAdapter::close(u16 code, String reason)
|
||||
void WebSocketClientSocketAdapter::close(u16 code, DeprecatedString reason)
|
||||
{
|
||||
m_websocket->close(code, reason);
|
||||
}
|
||||
|
|
@ -115,7 +115,7 @@ WebSocketClientManagerAdapter::WebSocketClientManagerAdapter(NonnullRefPtr<Proto
|
|||
|
||||
WebSocketClientManagerAdapter::~WebSocketClientManagerAdapter() = default;
|
||||
|
||||
RefPtr<Web::WebSockets::WebSocketClientSocket> WebSocketClientManagerAdapter::connect(const AK::URL& url, String const& origin)
|
||||
RefPtr<Web::WebSockets::WebSocketClientSocket> WebSocketClientManagerAdapter::connect(const AK::URL& url, DeprecatedString const& origin)
|
||||
{
|
||||
auto underlying_websocket = m_websocket_client->connect(url, origin);
|
||||
if (!underlying_websocket)
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ public:
|
|||
|
||||
virtual void send(ByteBuffer binary_or_text_message, bool is_text) override;
|
||||
virtual void send(StringView text_message) override;
|
||||
virtual void close(u16 code = 1005, String reason = {}) override;
|
||||
virtual void close(u16 code = 1005, DeprecatedString reason = {}) override;
|
||||
|
||||
private:
|
||||
WebSocketClientSocketAdapter(NonnullRefPtr<Protocol::WebSocket>);
|
||||
|
|
@ -43,7 +43,7 @@ public:
|
|||
|
||||
virtual ~WebSocketClientManagerAdapter() override;
|
||||
|
||||
virtual RefPtr<Web::WebSockets::WebSocketClientSocket> connect(const AK::URL&, String const& origin) override;
|
||||
virtual RefPtr<Web::WebSockets::WebSocketClientSocket> connect(const AK::URL&, DeprecatedString const& origin) override;
|
||||
|
||||
private:
|
||||
WebSocketClientManagerAdapter(NonnullRefPtr<Protocol::WebSocketClient>);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue