From a53459192fd62afc42964f83f5bf6a558734dc3b Mon Sep 17 00:00:00 2001
From: Shannon Booth <shannon@serenityos.org>
Date: Sun, 3 Sep 2023 01:09:33 +1200
Subject: [PATCH] LibWeb: Add Optional<String> overload for
 Element::set_attribute

Which for now will just call the DeprecatedString version of this
function. This is intended to be used in porting code over to using the
new String equivalent with the end goal of removing the DeprecatedString
version of this function.

This allows us to port a whole heap of IDL interfaces from
DeprecatedString to String.
---
 Userland/Libraries/LibWeb/DOM/Element.cpp                 | 8 ++++++++
 Userland/Libraries/LibWeb/DOM/Element.h                   | 1 +
 Userland/Libraries/LibWeb/HTML/HTMLBRElement.idl          | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLBodyElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLDataElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLDivElement.idl         | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLEmbedElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLFontElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLFrameElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLFrameSetElement.idl    | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLHRElement.idl          | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLHeadingElement.idl     | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.idl      | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLImageElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLLIElement.idl          | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLLabelElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLLegendElement.idl      | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLLinkElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLMapElement.idl         | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLMarqueeElement.idl     | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLMetaElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLModElement.idl         | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLOListElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLOptGroupElement.idl    | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLParagraphElement.idl   | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLParamElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLSlotElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLSourceElement.idl      | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLStyleElement.idl       | 2 +-
 .../Libraries/LibWeb/HTML/HTMLTableCaptionElement.idl     | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.idl   | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTableColElement.idl    | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTableElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTableRowElement.idl    | 2 +-
 .../Libraries/LibWeb/HTML/HTMLTableSectionElement.idl     | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTextAreaElement.idl    | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTimeElement.idl        | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLTrackElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLUListElement.idl       | 2 +-
 Userland/Libraries/LibWeb/HTML/HTMLVideoElement.idl       | 2 +-
 Userland/Libraries/LibWeb/Page/Page.cpp                   | 4 ++--
 Userland/Libraries/LibWeb/SVG/SVGStyleElement.idl         | 2 +-
 44 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/Userland/Libraries/LibWeb/DOM/Element.cpp b/Userland/Libraries/LibWeb/DOM/Element.cpp
index 118dfa772b3..88bce907277 100644
--- a/Userland/Libraries/LibWeb/DOM/Element.cpp
+++ b/Userland/Libraries/LibWeb/DOM/Element.cpp
@@ -160,6 +160,14 @@ WebIDL::ExceptionOr<void> Element::set_attribute(DeprecatedFlyString const& name
     return {};
 }
 
+WebIDL::ExceptionOr<void> Element::set_attribute(DeprecatedFlyString const& name, Optional<String> const& value)
+{
+    if (!value.has_value())
+        return set_attribute(name, DeprecatedString {});
+
+    return set_attribute(name, value->to_deprecated_string());
+}
+
 // https://dom.spec.whatwg.org/#validate-and-extract
 WebIDL::ExceptionOr<QualifiedName> validate_and_extract(JS::Realm& realm, DeprecatedFlyString namespace_, DeprecatedFlyString qualified_name)
 {
diff --git a/Userland/Libraries/LibWeb/DOM/Element.h b/Userland/Libraries/LibWeb/DOM/Element.h
index 512f5788891..9a28516a234 100644
--- a/Userland/Libraries/LibWeb/DOM/Element.h
+++ b/Userland/Libraries/LibWeb/DOM/Element.h
@@ -96,6 +96,7 @@ public:
     DeprecatedString get_attribute_value(DeprecatedFlyString const& local_name, DeprecatedFlyString const& namespace_ = {}) const;
 
     virtual WebIDL::ExceptionOr<void> set_attribute(DeprecatedFlyString const& name, DeprecatedString const& value);
+    WebIDL::ExceptionOr<void> set_attribute(DeprecatedFlyString const& name, Optional<String> const& value);
     WebIDL::ExceptionOr<void> set_attribute_ns(DeprecatedFlyString const& namespace_, DeprecatedFlyString const& qualified_name, DeprecatedString const& value);
     void set_attribute_value(DeprecatedFlyString const& local_name, DeprecatedString const& value, DeprecatedFlyString const& prefix = {}, DeprecatedFlyString const& namespace_ = {});
     WebIDL::ExceptionOr<JS::GCPtr<Attr>> set_attribute_node(Attr&);
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLBRElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLBRElement.idl
index 24109bc6f39..f4b1a5bee4a 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLBRElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLBRElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlbrelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLBRElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.idl
index afb867caad7..47ae014d18e 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLBodyElement.idl
@@ -2,7 +2,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/sections.html#htmlbodyelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLBodyElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLDataElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLDataElement.idl
index a148b50d1be..707351f8c79 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLDataElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLDataElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmldataelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLDataElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLDivElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLDivElement.idl
index a264a4e53ad..69e56031f41 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLDivElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLDivElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmldivelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLDivElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLEmbedElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLEmbedElement.idl
index 109bfe001e7..2cf3c34c1b8 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLEmbedElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLEmbedElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlembedelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLEmbedElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLFontElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLFontElement.idl
index b778b671a9c..9121dd32b3b 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLFontElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLFontElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlfontelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLFontElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLFrameElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLFrameElement.idl
index 8290bbf8944..89c4e229c5f 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLFrameElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLFrameElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlframeelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLFrameElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLFrameSetElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLFrameSetElement.idl
index 10160ae86b1..9e984482af6 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLFrameSetElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLFrameSetElement.idl
@@ -2,7 +2,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlframesetelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLFrameSetElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLHRElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLHRElement.idl
index cb08c8b5dd0..172e7a31a4e 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLHRElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLHRElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/grouping-content.html#htmlhrelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLHRElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLHeadingElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLHeadingElement.idl
index 605d0242eaf..d1df2dcca2d 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLHeadingElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLHeadingElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlheadingelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLHeadingElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.idl
index c09ac5cece0..8c27c495ae7 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLHtmlElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlhtmlelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLHtmlElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.idl
index cd86fd3439a..bff188e0268 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLIFrameElement.idl
@@ -2,7 +2,7 @@
 #import <DOM/Document.idl>
 
 // https://html.spec.whatwg.org/multipage/iframe-embed-object.html#htmliframeelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLIFrameElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLImageElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLImageElement.idl
index f81f4a08b77..4304041b62f 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLImageElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLImageElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/embedded-content.html#htmlimageelement
-[Exposed=Window, LegacyFactoryFunction=Image(optional unsigned long width, optional unsigned long height), UseDeprecatedAKString]
+[Exposed=Window, LegacyFactoryFunction=Image(optional unsigned long width, optional unsigned long height)]
 interface HTMLImageElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLLIElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLLIElement.idl
index e652f9fb7e7..791e297972b 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLLIElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLLIElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/grouping-content.html#htmllielement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLLIElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLLabelElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLLabelElement.idl
index 68a98cb7c48..002ecee32c7 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLLabelElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLLabelElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/forms.html#htmllabelelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLLabelElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLLegendElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLLegendElement.idl
index cb74b3f0aaa..506853c9d9f 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLLegendElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLLegendElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/form-elements.html#htmllegendelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLLegendElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.idl
index 8d07677ed9e..f503297d1d9 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLLinkElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmllinkelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLLinkElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLMapElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLMapElement.idl
index 70a18a35626..79da6e07eed 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLMapElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLMapElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/image-maps.html#htmlmapelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLMapElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLMarqueeElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLMarqueeElement.idl
index 40a0aae52de..b9fd06c4743 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLMarqueeElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLMarqueeElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/obsolete.html#htmlmarqueeelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLMarqueeElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLMetaElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLMetaElement.idl
index 9845d869be6..35bffbd2468 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLMetaElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLMetaElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlmetaelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLMetaElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLModElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLModElement.idl
index 69b406f995e..b3312f432b6 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLModElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLModElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/edits.html#htmlmodelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLModElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLOListElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLOListElement.idl
index 6d1bfa19239..61f70ae4316 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLOListElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLOListElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/grouping-content.html#htmlolistelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLOListElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLOptGroupElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLOptGroupElement.idl
index ecf52ac9274..04b58729040 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLOptGroupElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLOptGroupElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/form-elements.html#htmloptgroupelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLOptGroupElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLParagraphElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLParagraphElement.idl
index eba322cd99c..0ca919f2e95 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLParagraphElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLParagraphElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlparagraphelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLParagraphElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLParamElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLParamElement.idl
index 629be0afc10..3623c58f089 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLParamElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLParamElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/obsolete.html#htmlparamelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLParamElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.idl
index 77638027a6a..623f73d3cd6 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLQuoteElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/grouping-content.html#htmlquoteelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLQuoteElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLSlotElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLSlotElement.idl
index d34e5eced4d..64cb999bd87 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLSlotElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLSlotElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/scripting.html#htmlslotelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLSlotElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLSourceElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLSourceElement.idl
index e918b5e3134..49aeb6d57a6 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLSourceElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLSourceElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/embedded-content.html#htmlsourceelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLSourceElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLStyleElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLStyleElement.idl
index ad1031e6c4f..600459b4ddf 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLStyleElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLStyleElement.idl
@@ -3,7 +3,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/semantics.html#htmlstyleelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLStyleElement : HTMLElement {
     [HTMLConstructor] constructor();
 
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableCaptionElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTableCaptionElement.idl
index e577bdd8199..b0413d9dae6 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTableCaptionElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTableCaptionElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/tables.html#htmltablecaptionelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTableCaptionElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.idl
index 6357509ffe6..d9fddd3bbb1 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTableCellElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/tables.html#htmltablecellelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTableCellElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableColElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTableColElement.idl
index 89ebfd45a1d..b84f50403bf 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTableColElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTableColElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/tables.html#htmltablecolelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTableColElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTableElement.idl
index 4f4b8a94db1..d6a2b1c8e1e 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTableElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTableElement.idl
@@ -5,7 +5,7 @@
 #import <DOM/HTMLCollection.idl>
 
 // https://html.spec.whatwg.org/multipage/tables.html#htmltableelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTableElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableRowElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTableRowElement.idl
index 6ca81df31bd..9a35671b75a 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTableRowElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTableRowElement.idl
@@ -3,7 +3,7 @@
 #import <HTML/HTMLTableCellElement.idl>
 
 // https://html.spec.whatwg.org/multipage/tables.html#htmltablerowelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTableRowElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTableSectionElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTableSectionElement.idl
index b1dcc6911ec..d1ff615f05f 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTableSectionElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTableSectionElement.idl
@@ -3,7 +3,7 @@
 #import <HTML/HTMLTableRowElement.idl>
 
 // https://html.spec.whatwg.org/multipage/tables.html#htmltablesectionelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTableSectionElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTextAreaElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTextAreaElement.idl
index 65e13d5844c..2ade76aaca3 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTextAreaElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTextAreaElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/form-elements.html#htmltextareaelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTextAreaElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTimeElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTimeElement.idl
index 25716bfe6a2..76da859ad93 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTimeElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTimeElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/text-level-semantics.html#htmltimeelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTimeElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLTrackElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLTrackElement.idl
index 76b34bdaf4d..f4ff0df6640 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLTrackElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLTrackElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/media.html#htmltrackelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLTrackElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLUListElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLUListElement.idl
index d3963751c5b..207ffc08d7a 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLUListElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLUListElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLElement.idl>
 
 // https://html.spec.whatwg.org/multipage/grouping-content.html#htmlulistelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLUListElement : HTMLElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/HTML/HTMLVideoElement.idl b/Userland/Libraries/LibWeb/HTML/HTMLVideoElement.idl
index 75303c1e6e3..4e270ba3bf5 100644
--- a/Userland/Libraries/LibWeb/HTML/HTMLVideoElement.idl
+++ b/Userland/Libraries/LibWeb/HTML/HTMLVideoElement.idl
@@ -1,7 +1,7 @@
 #import <HTML/HTMLMediaElement.idl>
 
 // https://html.spec.whatwg.org/multipage/media.html#htmlvideoelement
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface HTMLVideoElement : HTMLMediaElement {
 
     [HTMLConstructor] constructor();
diff --git a/Userland/Libraries/LibWeb/Page/Page.cpp b/Userland/Libraries/LibWeb/Page/Page.cpp
index b3017d87e68..ab563208d12 100644
--- a/Userland/Libraries/LibWeb/Page/Page.cpp
+++ b/Userland/Libraries/LibWeb/Page/Page.cpp
@@ -337,7 +337,7 @@ WebIDL::ExceptionOr<void> Page::toggle_media_loop_state()
     if (media_element->has_attribute(HTML::AttributeNames::loop))
         media_element->remove_attribute(HTML::AttributeNames::loop);
     else
-        TRY(media_element->set_attribute(HTML::AttributeNames::loop, {}));
+        TRY(media_element->set_attribute(HTML::AttributeNames::loop, OptionalNone {}));
 
     return {};
 }
@@ -353,7 +353,7 @@ WebIDL::ExceptionOr<void> Page::toggle_media_controls_state()
     if (media_element->has_attribute(HTML::AttributeNames::controls))
         media_element->remove_attribute(HTML::AttributeNames::controls);
     else
-        TRY(media_element->set_attribute(HTML::AttributeNames::controls, {}));
+        TRY(media_element->set_attribute(HTML::AttributeNames::controls, OptionalNone {}));
 
     return {};
 }
diff --git a/Userland/Libraries/LibWeb/SVG/SVGStyleElement.idl b/Userland/Libraries/LibWeb/SVG/SVGStyleElement.idl
index 14d5d839fd4..b1fcd5f7ba0 100644
--- a/Userland/Libraries/LibWeb/SVG/SVGStyleElement.idl
+++ b/Userland/Libraries/LibWeb/SVG/SVGStyleElement.idl
@@ -1,7 +1,7 @@
 #import <CSS/LinkStyle.idl>
 #import <SVG/SVGElement.idl>
 
-[Exposed=Window, UseDeprecatedAKString]
+[Exposed=Window]
 interface SVGStyleElement : SVGElement {
   [Reflect] attribute DOMString type;
   [Reflect] attribute DOMString media;