1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 11:47:34 +00:00

LibWeb+Ladybird+Userland: Port window.[alert,confirm,prompt] to String

LibGUI and WebDriver (read: JSON) API boundaries use DeprecatedString,
so that is as far as these changes can reach.

The one change which isn't just a DeprecatedString to String replacement
is handling the "null" prompt response. We previously checked for the
null DeprecatedString, whereas we now represent this as an empty
Optional<String>.
This commit is contained in:
Timothy Flynn 2023-03-13 17:30:51 -04:00 committed by Linus Groh
parent b4d3fea002
commit 97536e4684
18 changed files with 85 additions and 85 deletions

View file

@ -598,7 +598,7 @@ void ConnectionFromClient::confirm_closed(bool accepted)
m_page_host->confirm_closed(accepted);
}
void ConnectionFromClient::prompt_closed(DeprecatedString const& response)
void ConnectionFromClient::prompt_closed(Optional<String> const& response)
{
m_page_host->prompt_closed(response);
}

View file

@ -88,7 +88,7 @@ private:
virtual void alert_closed() override;
virtual void confirm_closed(bool accepted) override;
virtual void prompt_closed(DeprecatedString const& response) override;
virtual void prompt_closed(Optional<String> const& response) override;
virtual Messages::WebContentServer::TakeDocumentScreenshotResponse take_document_screenshot() override;

View file

@ -282,7 +282,7 @@ void PageHost::page_did_request_link_context_menu(Web::CSSPixelPoint content_pos
m_client.async_did_request_link_context_menu(page().css_to_device_point(content_position).to_type<int>(), url, target, modifiers);
}
void PageHost::page_did_request_alert(DeprecatedString const& message)
void PageHost::page_did_request_alert(String const& message)
{
m_client.async_did_request_alert(message);
}
@ -292,7 +292,7 @@ void PageHost::alert_closed()
page().alert_closed();
}
void PageHost::page_did_request_confirm(DeprecatedString const& message)
void PageHost::page_did_request_confirm(String const& message)
{
m_client.async_did_request_confirm(message);
}
@ -302,17 +302,17 @@ void PageHost::confirm_closed(bool accepted)
page().confirm_closed(accepted);
}
void PageHost::page_did_request_prompt(DeprecatedString const& message, DeprecatedString const& default_)
void PageHost::page_did_request_prompt(String const& message, String const& default_)
{
m_client.async_did_request_prompt(message, default_);
}
void PageHost::page_did_request_set_prompt_text(DeprecatedString const& text)
void PageHost::page_did_request_set_prompt_text(String const& text)
{
m_client.async_did_request_set_prompt_text(text);
}
void PageHost::prompt_closed(DeprecatedString response)
void PageHost::prompt_closed(Optional<String> response)
{
page().prompt_closed(move(response));
}

View file

@ -46,7 +46,7 @@ public:
void alert_closed();
void confirm_closed(bool accepted);
void prompt_closed(DeprecatedString response);
void prompt_closed(Optional<String> response);
private:
// ^PageClient
@ -83,10 +83,10 @@ private:
virtual void page_did_start_loading(const URL&, bool) override;
virtual void page_did_create_main_document() override;
virtual void page_did_finish_loading(const URL&) override;
virtual void page_did_request_alert(DeprecatedString const&) override;
virtual void page_did_request_confirm(DeprecatedString const&) override;
virtual void page_did_request_prompt(DeprecatedString const&, DeprecatedString const&) override;
virtual void page_did_request_set_prompt_text(DeprecatedString const&) override;
virtual void page_did_request_alert(String const&) override;
virtual void page_did_request_confirm(String const&) override;
virtual void page_did_request_prompt(String const&, String const&) override;
virtual void page_did_request_set_prompt_text(String const&) override;
virtual void page_did_request_accept_dialog() override;
virtual void page_did_request_dismiss_dialog() override;
virtual void page_did_change_favicon(Gfx::Bitmap const&) override;

View file

@ -29,10 +29,10 @@ endpoint WebContentClient
did_request_context_menu(Gfx::IntPoint content_position) =|
did_request_link_context_menu(Gfx::IntPoint content_position, URL url, DeprecatedString target, unsigned modifiers) =|
did_request_image_context_menu(Gfx::IntPoint content_position, URL url, DeprecatedString target, unsigned modifiers, Gfx::ShareableBitmap bitmap) =|
did_request_alert(DeprecatedString message) =|
did_request_confirm(DeprecatedString message) =|
did_request_prompt(DeprecatedString message, DeprecatedString default_) =|
did_request_set_prompt_text(DeprecatedString message) =|
did_request_alert(String message) =|
did_request_confirm(String message) =|
did_request_prompt(String message, String default_) =|
did_request_set_prompt_text(String message) =|
did_request_accept_dialog() =|
did_request_dismiss_dialog() =|
did_get_source(URL url, DeprecatedString source) =|

View file

@ -70,5 +70,5 @@ endpoint WebContentServer
alert_closed() =|
confirm_closed(bool accepted) =|
prompt_closed(DeprecatedString response) =|
prompt_closed(Optional<String> response) =|
}

View file

@ -1640,7 +1640,7 @@ Messages::WebDriverClient::GetAlertTextResponse WebDriverConnection::get_alert_t
// 4. Return success with data message.
if (message.has_value())
return *message;
return message->to_deprecated_string();
return JsonValue {};
}
@ -1679,7 +1679,7 @@ Messages::WebDriverClient::SendAlertTextResponse WebDriverConnection::send_alert
}
// 6. Perform user agent dependent steps to set the value of current user prompts text field to text.
m_page_client.page_did_request_set_prompt_text(move(text));
m_page_client.page_did_request_set_prompt_text(TRY(String::from_deprecated_string(text)));
// 7. Return success with data null.
return JsonValue {};