diff options
Diffstat (limited to 'Userland')
4 files changed, 7 insertions, 7 deletions
diff --git a/Userland/Libraries/LibWeb/HTML/AbstractBrowsingContext.h b/Userland/Libraries/LibWeb/HTML/AbstractBrowsingContext.h index 03fadf4c3c..881abc3c25 100644 --- a/Userland/Libraries/LibWeb/HTML/AbstractBrowsingContext.h +++ b/Userland/Libraries/LibWeb/HTML/AbstractBrowsingContext.h @@ -22,8 +22,8 @@ public: virtual HTML::WindowProxy* window_proxy() = 0; virtual HTML::WindowProxy const* window_proxy() const = 0; - DeprecatedString const& name() const { return m_name; } - void set_name(DeprecatedString const& name) { m_name = name; } + String const& name() const { return m_name; } + void set_name(String const& name) { m_name = name; } JS::GCPtr<BrowsingContext> opener_browsing_context() const { return m_opener_browsing_context; } void set_opener_browsing_context(JS::GCPtr<BrowsingContext> browsing_context) { m_opener_browsing_context = browsing_context; } @@ -45,7 +45,7 @@ public: virtual void set_window_handle(String handle) = 0; protected: - DeprecatedString m_name; + String m_name; // https://html.spec.whatwg.org/multipage/browsers.html#is-popup TokenizedFeature::Popup m_is_popup { TokenizedFeature::Popup::No }; diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp b/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp index 51799ac714..7649bcf37d 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContext.cpp @@ -724,7 +724,7 @@ BrowsingContext::ChosenBrowsingContext BrowsingContext::choose_a_browsing_contex // 6. If name is not an ASCII case-insensitive match for "_blank", then set chosen's name to name. if (!Infra::is_ascii_case_insensitive_match(name, "_blank"sv)) - chosen->set_name(name); + chosen->set_name(String::from_deprecated_string(name).release_value_but_fixme_should_propagate_errors()); } // --> If the user agent has been configured such that in this instance t will reuse current diff --git a/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp b/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp index c51093b93f..483515b582 100644 --- a/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp +++ b/Userland/Libraries/LibWeb/HTML/BrowsingContextContainer.cpp @@ -58,7 +58,7 @@ void BrowsingContextContainer::create_new_nested_browsing_context() // 4. If element has a name attribute, then set browsingContext's name to the value of this attribute. if (auto name = attribute(HTML::AttributeNames::name); !name.is_empty()) - m_nested_browsing_context->set_name(name); + m_nested_browsing_context->set_name(String::from_deprecated_string(name).release_value_but_fixme_should_propagate_errors()); } // https://html.spec.whatwg.org/multipage/browsers.html#concept-bcc-content-document diff --git a/Userland/Libraries/LibWeb/HTML/Window.cpp b/Userland/Libraries/LibWeb/HTML/Window.cpp index 37a7e5c4c6..fe7a8041a9 100644 --- a/Userland/Libraries/LibWeb/HTML/Window.cpp +++ b/Userland/Libraries/LibWeb/HTML/Window.cpp @@ -788,7 +788,7 @@ String Window::name() const return String {}; // 2. Return this's navigable's target name. - return String::from_deprecated_string(browsing_context()->name()).release_value_but_fixme_should_propagate_errors(); + return browsing_context()->name(); } // https://html.spec.whatwg.org/multipage/nav-history-apis.html#apis-for-creating-and-navigating-browsing-contexts-by-name:dom-name @@ -799,7 +799,7 @@ void Window::set_name(String const& name) return; // 2. Set this's navigable's active session history entry's document state's navigable target name to the given value. - browsing_context()->set_name(name.to_deprecated_string()); + browsing_context()->set_name(name); } // https://html.spec.whatwg.org/multipage/nav-history-apis.html#dom-location |