LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 01:37:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Port History interface from DeprecatedString to String

Browse Source
This commit is contained in:
Shannon Booth 2023-08-26 17:03:52 +12:00 committed by Andrew Kaster
parent 7b79324548
commit 72f54eca26
Notes: sideshowbarker 2024-07-17 01:04:03 +09:00 
Author: https://github.com/shannonbooth
Commit: https://github.com/SerenityOS/serenity/commit/72f54eca26
Pull-request: https://github.com/SerenityOS/serenity/pull/20799
Reviewed-by: https://github.com/ADKaster ✅
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Userland/Libraries/LibWeb/DOM/Range.idl
View File

@ -2,7 +2,7 @@
#import <DOM/AbstractRange.idl>
#import <Geometry/DOMRect.idl>
[Exposed=Window]
[Exposed=Window, UseNewAKString]
interface Range : AbstractRange {
constructor();

10
Userland/Libraries/LibWeb/HTML/History.cpp
View File

@ -37,14 +37,14 @@ void History::visit_edges(Cell::Visitor& visitor)
}
// https://html.spec.whatwg.org/multipage/history.html#dom-history-pushstate
WebIDL::ExceptionOr<void> History::push_state(JS::Value data, DeprecatedString const&, DeprecatedString const& url)
WebIDL::ExceptionOr<void> History::push_state(JS::Value data, String const&, Optional<String> const& url)
{
// NOTE: The second parameter of this function is intentionally unused.
return shared_history_push_replace_state(data, url, IsPush::Yes);
}
// https://html.spec.whatwg.org/multipage/history.html#dom-history-replacestate
WebIDL::ExceptionOr<void> History::replace_state(JS::Value data, DeprecatedString const&, DeprecatedString const& url)
WebIDL::ExceptionOr<void> History::replace_state(JS::Value data, String const&, Optional<String> const& url)
{
// NOTE: The second parameter of this function is intentionally unused.
return shared_history_push_replace_state(data, url, IsPush::No);
@ -150,7 +150,7 @@ static bool can_have_its_url_rewritten(DOM::Document const& document, AK::URL co
}
// https://html.spec.whatwg.org/multipage/history.html#shared-history-push/replace-state-steps
WebIDL::ExceptionOr<void> History::shared_history_push_replace_state(JS::Value value, DeprecatedString const& url, IsPush)
WebIDL::ExceptionOr<void> History::shared_history_push_replace_state(JS::Value value, Optional<String> const& url, IsPush)
{
// 1. Let document be history's associated Document.
auto& document = m_associated_document;
@ -171,10 +171,10 @@ WebIDL::ExceptionOr<void> History::shared_history_push_replace_state(JS::Value v
auto new_url = document->url();
// 6. If url is not null or the empty string, then:
if (!url.is_empty() && !url.is_null()) {
if (url.has_value() && !url->is_empty()) {
// 1. Parse url, relative to the relevant settings object of history.
auto parsed_url = relevant_settings_object(*this).parse_url(url);
auto parsed_url = relevant_settings_object(*this).parse_url(url->to_deprecated_string());
// 2. If that fails, then throw a "SecurityError" DOMException.
if (!parsed_url.is_valid())

6
Userland/Libraries/LibWeb/HTML/History.h
View File

@ -20,8 +20,8 @@ public:
virtual ~History() override;
WebIDL::ExceptionOr<void> push_state(JS::Value data, DeprecatedString const& unused, DeprecatedString const& url);
WebIDL::ExceptionOr<void> replace_state(JS::Value data, DeprecatedString const& unused, DeprecatedString const& url);
WebIDL::ExceptionOr<void> push_state(JS::Value data, String const& unused, Optional<String> const& url = {});
WebIDL::ExceptionOr<void> replace_state(JS::Value data, String const& unused, Optional<String> const& url = {});
WebIDL::ExceptionOr<void> go(long delta);
WebIDL::ExceptionOr<void> back();
WebIDL::ExceptionOr<void> forward();
@ -37,7 +37,7 @@ private:
No,
Yes,
};
WebIDL::ExceptionOr<void> shared_history_push_replace_state(JS::Value data, DeprecatedString const& url, IsPush is_push);
WebIDL::ExceptionOr<void> shared_history_push_replace_state(JS::Value data, Optional<String> const& url, IsPush is_push);
JS::NonnullGCPtr<DOM::Document> m_associated_document;
};

2
Userland/Libraries/LibWeb/HTML/History.idl
View File

@ -1,5 +1,5 @@
// https://html.spec.whatwg.org/multipage/history.html#the-history-interface
[Exposed=Window]
[Exposed=Window, UseNewAKString]
interface History {
readonly attribute unsigned long length;
// FIXME: attribute ScrollRestoration scrollRestoration;