From 63aa93aaf46eb73a6311b5684b346148e20a08e2 Mon Sep 17 00:00:00 2001 From: Shannon Booth Date: Sun, 3 Sep 2023 15:39:01 +1200 Subject: [PATCH] LibWeb: Port HTMLObjectElement interface from DeprecatedString to String --- Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp | 4 ++-- Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h | 4 ++-- Userland/Libraries/LibWeb/HTML/HTMLObjectElement.idl | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp index d37e12ad28..7f6e643c9b 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.cpp @@ -67,10 +67,10 @@ void HTMLObjectElement::attribute_changed(DeprecatedFlyString const& name, Depre } // https://html.spec.whatwg.org/multipage/iframe-embed-object.html#attr-object-data -DeprecatedString HTMLObjectElement::data() const +String HTMLObjectElement::data() const { auto data = deprecated_attribute(HTML::AttributeNames::data); - return document().parse_url(data).to_deprecated_string(); + return MUST(document().parse_url(data).to_string()); } JS::GCPtr HTMLObjectElement::create_layout_node(NonnullRefPtr style) diff --git a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h index d4c8db284c..be1ced8c39 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h +++ b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.h @@ -36,8 +36,8 @@ public: virtual void attribute_changed(DeprecatedFlyString const& name, DeprecatedString const& value) override; - DeprecatedString data() const; - void set_data(DeprecatedString const& data) { MUST(set_attribute(HTML::AttributeNames::data, data)); } + String data() const; + void set_data(String const& data) { MUST(set_attribute(HTML::AttributeNames::data, data)); } DeprecatedString type() const { return deprecated_attribute(HTML::AttributeNames::type); } diff --git a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.idl index f939945e89..1e40ca5329 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.idl +++ b/Userland/Libraries/LibWeb/HTML/HTMLObjectElement.idl @@ -2,7 +2,7 @@ #import // https://html.spec.whatwg.org/multipage/iframe-embed-object.html#htmlobjectelement -[Exposed=Window, UseDeprecatedAKString] +[Exposed=Window] interface HTMLObjectElement : HTMLElement { [HTMLConstructor] constructor();