mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 01:17:46 +00:00
Everywhere: Rename {Deprecated => Byte}String
This commit un-deprecates DeprecatedString, and repurposes it as a byte string. As the null state has already been removed, there are no other particularly hairy blockers in repurposing this type as a byte string (what it _really_ is). This commit is auto-generated: $ xs=$(ack -l \bDeprecatedString\b\|deprecated_string AK Userland \ Meta Ports Ladybird Tests Kernel) $ perl -pie 's/\bDeprecatedString\b/ByteString/g; s/deprecated_string/byte_string/g' $xs $ clang-format --style=file -i \ $(git diff --name-only | grep \.cpp\|\.h) $ gn format $(git ls-files '*.gn' '*.gni')
This commit is contained in:
parent
38d62563b3
commit
5e1499d104
1615 changed files with 10257 additions and 10257 deletions
|
@ -61,7 +61,7 @@ void Client::close_session(unsigned session_id)
|
|||
static void initialize_session_from_capabilities(WebContentConnection& web_content_connection, JsonObject& capabilities)
|
||||
{
|
||||
// 1. Let strategy be the result of getting property "pageLoadStrategy" from capabilities.
|
||||
auto strategy = capabilities.get_deprecated_string("pageLoadStrategy"sv);
|
||||
auto strategy = capabilities.get_byte_string("pageLoadStrategy"sv);
|
||||
|
||||
// 2. If strategy is a string, set the current session’s page loading strategy to strategy. Otherwise, set the page loading strategy to normal and set a property of capabilities with name "pageLoadStrategy" and value "normal".
|
||||
if (strategy.has_value())
|
||||
|
@ -97,7 +97,7 @@ static void initialize_session_from_capabilities(WebContentConnection& web_conte
|
|||
}
|
||||
|
||||
// 8. Apply changes to the user agent for any implementation-defined capabilities selected during the capabilities processing step.
|
||||
auto behavior = capabilities.get_deprecated_string("unhandledPromptBehavior"sv);
|
||||
auto behavior = capabilities.get_byte_string("unhandledPromptBehavior"sv);
|
||||
if (behavior.has_value())
|
||||
web_content_connection.async_set_unhandled_prompt_behavior(Web::WebDriver::unhandled_prompt_behavior_from_string(*behavior));
|
||||
else
|
||||
|
@ -139,7 +139,7 @@ Web::WebDriver::Response Client::new_session(Web::WebDriver::Parameters, JsonVal
|
|||
auto session = make_ref_counted<Session>(session_id, *this, move(options));
|
||||
|
||||
if (auto start_result = session->start(m_callbacks); start_result.is_error())
|
||||
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::SessionNotCreated, DeprecatedString::formatted("Failed to start session: {}", start_result.error()));
|
||||
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::SessionNotCreated, ByteString::formatted("Failed to start session: {}", start_result.error()));
|
||||
|
||||
auto& web_content_connection = session->web_content_connection();
|
||||
|
||||
|
@ -160,7 +160,7 @@ Web::WebDriver::Response Client::new_session(Web::WebDriver::Parameters, JsonVal
|
|||
JsonObject body;
|
||||
// "sessionId"
|
||||
// session id
|
||||
body.set("sessionId", DeprecatedString::number(session_id));
|
||||
body.set("sessionId", ByteString::number(session_id));
|
||||
// "capabilities"
|
||||
// capabilities
|
||||
body.set("capabilities", move(capabilities));
|
||||
|
@ -323,7 +323,7 @@ Web::WebDriver::Response Client::switch_to_window(Web::WebDriver::Parameters par
|
|||
if (!handle.has_value())
|
||||
return Web::WebDriver::Error::from_code(Web::WebDriver::ErrorCode::InvalidArgument, "No property called 'handle' present");
|
||||
|
||||
return session->switch_to_window(handle->to_deprecated_string());
|
||||
return session->switch_to_window(handle->to_byte_string());
|
||||
}
|
||||
|
||||
// 11.4 Get Window Handles, https://w3c.github.io/webdriver/#dfn-get-window-handles
|
||||
|
|
|
@ -19,8 +19,8 @@
|
|||
namespace WebDriver {
|
||||
|
||||
struct LaunchBrowserCallbacks {
|
||||
Function<ErrorOr<pid_t>(DeprecatedString const&)> launch_browser;
|
||||
Function<ErrorOr<pid_t>(DeprecatedString const&)> launch_headless_browser;
|
||||
Function<ErrorOr<pid_t>(ByteString const&)> launch_browser;
|
||||
Function<ErrorOr<pid_t>(ByteString const&)> launch_headless_browser;
|
||||
};
|
||||
|
||||
class Client final : public Web::WebDriver::Client {
|
||||
|
|
|
@ -98,7 +98,7 @@ ErrorOr<void> Session::start(LaunchBrowserCallbacks const& callbacks)
|
|||
{
|
||||
auto promise = TRY(ServerPromise::try_create());
|
||||
|
||||
m_web_content_socket_path = DeprecatedString::formatted("{}/webdriver/session_{}_{}", TRY(Core::StandardPaths::runtime_directory()), getpid(), m_id);
|
||||
m_web_content_socket_path = ByteString::formatted("{}/webdriver/session_{}_{}", TRY(Core::StandardPaths::runtime_directory()), getpid(), m_id);
|
||||
m_web_content_server = TRY(create_server(promise));
|
||||
|
||||
if (m_options.headless)
|
||||
|
|
|
@ -66,7 +66,7 @@ private:
|
|||
HashMap<String, Window> m_windows;
|
||||
String m_current_window_handle;
|
||||
|
||||
Optional<DeprecatedString> m_web_content_socket_path;
|
||||
Optional<ByteString> m_web_content_socket_path;
|
||||
Optional<pid_t> m_browser_pid;
|
||||
|
||||
RefPtr<Core::LocalServer> m_web_content_server;
|
||||
|
|
|
@ -14,7 +14,7 @@
|
|||
#include <LibMain/Main.h>
|
||||
#include <WebDriver/Client.h>
|
||||
|
||||
static ErrorOr<pid_t> launch_browser(DeprecatedString const& socket_path)
|
||||
static ErrorOr<pid_t> launch_browser(ByteString const& socket_path)
|
||||
{
|
||||
return Core::Process::spawn("/bin/Browser"sv,
|
||||
Array {
|
||||
|
@ -24,7 +24,7 @@ static ErrorOr<pid_t> launch_browser(DeprecatedString const& socket_path)
|
|||
});
|
||||
}
|
||||
|
||||
static ErrorOr<pid_t> launch_headless_browser(DeprecatedString const& socket_path)
|
||||
static ErrorOr<pid_t> launch_headless_browser(ByteString const& socket_path)
|
||||
{
|
||||
return Core::Process::spawn("/bin/headless-browser"sv,
|
||||
Array {
|
||||
|
@ -36,10 +36,10 @@ static ErrorOr<pid_t> launch_headless_browser(DeprecatedString const& socket_pat
|
|||
|
||||
ErrorOr<int> serenity_main(Main::Arguments arguments)
|
||||
{
|
||||
DeprecatedString default_listen_address = "0.0.0.0";
|
||||
ByteString default_listen_address = "0.0.0.0";
|
||||
u16 default_port = 8000;
|
||||
|
||||
DeprecatedString listen_address = default_listen_address;
|
||||
ByteString listen_address = default_listen_address;
|
||||
int port = default_port;
|
||||
|
||||
Core::ArgsParser args_parser;
|
||||
|
@ -60,7 +60,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
|
|||
|
||||
TRY(Core::System::pledge("stdio accept cpath rpath recvfd inet unix proc exec fattr"));
|
||||
|
||||
auto webdriver_socket_path = DeprecatedString::formatted("{}/webdriver", TRY(Core::StandardPaths::runtime_directory()));
|
||||
auto webdriver_socket_path = ByteString::formatted("{}/webdriver", TRY(Core::StandardPaths::runtime_directory()));
|
||||
TRY(Core::Directory::create(webdriver_socket_path, Core::Directory::CreateDirectories::Yes));
|
||||
|
||||
Core::EventLoop loop;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue