LibWeb: Move string literals to {HTML,UIEvents}::EventNames.h

This moves the reamining string literals from GlobalEventHandlers.h to
{HTML,UIEvents}::EventNames.h.

3 files changed, 147 insertions, 112 deletions

diff --git a/Userland/Libraries/LibWeb/HTML/EventNames.h b/Userland/Libraries/LibWeb/HTML/EventNames.h
index a55b95813c..bc8d14b676 100644
--- a/Userland/Libraries/LibWeb/HTML/EventNames.h
+++ b/Userland/Libraries/LibWeb/HTML/EventNames.h
@@ -15,51 +15,85 @@ namespace Web::HTML::EventNames {
 // FIXME: Add app cache events https://html.spec.whatwg.org/multipage/offline.html#appcacheevents
 // FIXME: Add drag and drop events https://html.spec.whatwg.org/multipage/dnd.html#dndevents
 
-#define ENUMERATE_HTML_EVENTS                       \
-    __ENUMERATE_HTML_EVENT(abort)                   \
-    __ENUMERATE_HTML_EVENT(DOMContentLoaded)        \
-    __ENUMERATE_HTML_EVENT(afterprint)              \
-    __ENUMERATE_HTML_EVENT(beforeprint)             \
-    __ENUMERATE_HTML_EVENT(beforeunload)            \
-    __ENUMERATE_HTML_EVENT(blur)                    \
-    __ENUMERATE_HTML_EVENT(cancel)                  \
-    __ENUMERATE_HTML_EVENT(change)                  \
-    __ENUMERATE_HTML_EVENT(click)                   \
-    __ENUMERATE_HTML_EVENT(close)                   \
-    __ENUMERATE_HTML_EVENT(connect)                 \
-    __ENUMERATE_HTML_EVENT(contextmenu)             \
-    __ENUMERATE_HTML_EVENT(copy)                    \
-    __ENUMERATE_HTML_EVENT(cut)                     \
-    __ENUMERATE_HTML_EVENT(error)                   \
-    __ENUMERATE_HTML_EVENT(focus)                   \
-    __ENUMERATE_HTML_EVENT(formdata)                \
-    __ENUMERATE_HTML_EVENT(hashchange)              \
-    __ENUMERATE_HTML_EVENT(input)                   \
-    __ENUMERATE_HTML_EVENT(invalid)                 \
-    __ENUMERATE_HTML_EVENT(languagechange)          \
-    __ENUMERATE_HTML_EVENT(load)                    \
-    __ENUMERATE_HTML_EVENT(message)                 \
-    __ENUMERATE_HTML_EVENT(messageerror)            \
-    __ENUMERATE_HTML_EVENT(offline)                 \
-    __ENUMERATE_HTML_EVENT(online)                  \
-    __ENUMERATE_HTML_EVENT(open)                    \
-    __ENUMERATE_HTML_EVENT(pagehide)                \
-    __ENUMERATE_HTML_EVENT(pageshow)                \
-    __ENUMERATE_HTML_EVENT(paste)                   \
-    __ENUMERATE_HTML_EVENT(popstate)                \
-    __ENUMERATE_HTML_EVENT(readystatechange)        \
-    __ENUMERATE_HTML_EVENT(rejectionhandled)        \
-    __ENUMERATE_HTML_EVENT(reset)                   \
-    __ENUMERATE_HTML_EVENT(scroll)                  \
-    __ENUMERATE_HTML_EVENT(securitypolicyviolation) \
-    __ENUMERATE_HTML_EVENT(select)                  \
-    __ENUMERATE_HTML_EVENT(slotchange)              \
-    __ENUMERATE_HTML_EVENT(storage)                 \
-    __ENUMERATE_HTML_EVENT(submit)                  \
-    __ENUMERATE_HTML_EVENT(toggle)                  \
-    __ENUMERATE_HTML_EVENT(unhandledrejection)      \
-    __ENUMERATE_HTML_EVENT(unload)                  \
-    __ENUMERATE_HTML_EVENT(visibilitychange)
+#define ENUMERATE_HTML_EVENTS                        \
+    __ENUMERATE_HTML_EVENT(abort)                    \
+    __ENUMERATE_HTML_EVENT(DOMContentLoaded)         \
+    __ENUMERATE_HTML_EVENT(afterprint)               \
+    __ENUMERATE_HTML_EVENT(beforeprint)              \
+    __ENUMERATE_HTML_EVENT(beforeunload)             \
+    __ENUMERATE_HTML_EVENT(blur)                     \
+    __ENUMERATE_HTML_EVENT(cancel)                   \
+    __ENUMERATE_HTML_EVENT(canplay)                  \
+    __ENUMERATE_HTML_EVENT(canplaythrough)           \
+    __ENUMERATE_HTML_EVENT(change)                   \
+    __ENUMERATE_HTML_EVENT(click)                    \
+    __ENUMERATE_HTML_EVENT(close)                    \
+    __ENUMERATE_HTML_EVENT(connect)                  \
+    __ENUMERATE_HTML_EVENT(contextmenu)              \
+    __ENUMERATE_HTML_EVENT(copy)                     \
+    __ENUMERATE_HTML_EVENT(cuechange)                \
+    __ENUMERATE_HTML_EVENT(cut)                      \
+    __ENUMERATE_HTML_EVENT(drag)                     \
+    __ENUMERATE_HTML_EVENT(dragend)                  \
+    __ENUMERATE_HTML_EVENT(dragenter)                \
+    __ENUMERATE_HTML_EVENT(dragleave)                \
+    __ENUMERATE_HTML_EVENT(dragover)                 \
+    __ENUMERATE_HTML_EVENT(dragstart)                \
+    __ENUMERATE_HTML_EVENT(drop)                     \
+    __ENUMERATE_HTML_EVENT(durationchange)           \
+    __ENUMERATE_HTML_EVENT(emptied)                  \
+    __ENUMERATE_HTML_EVENT(ended)                    \
+    __ENUMERATE_HTML_EVENT(error)                    \
+    __ENUMERATE_HTML_EVENT(focus)                    \
+    __ENUMERATE_HTML_EVENT(formdata)                 \
+    __ENUMERATE_HTML_EVENT(hashchange)               \
+    __ENUMERATE_HTML_EVENT(input)                    \
+    __ENUMERATE_HTML_EVENT(invalid)                  \
+    __ENUMERATE_HTML_EVENT(languagechange)           \
+    __ENUMERATE_HTML_EVENT(load)                     \
+    __ENUMERATE_HTML_EVENT(loaded)                   \
+    __ENUMERATE_HTML_EVENT(loadeddata)               \
+    __ENUMERATE_HTML_EVENT(loadedmetadata)           \
+    __ENUMERATE_HTML_EVENT(loadstart)                \
+    __ENUMERATE_HTML_EVENT(message)                  \
+    __ENUMERATE_HTML_EVENT(messageerror)             \
+    __ENUMERATE_HTML_EVENT(offline)                  \
+    __ENUMERATE_HTML_EVENT(online)                   \
+    __ENUMERATE_HTML_EVENT(open)                     \
+    __ENUMERATE_HTML_EVENT(pagehide)                 \
+    __ENUMERATE_HTML_EVENT(pageshow)                 \
+    __ENUMERATE_HTML_EVENT(paste)                    \
+    __ENUMERATE_HTML_EVENT(pause)                    \
+    __ENUMERATE_HTML_EVENT(play)                     \
+    __ENUMERATE_HTML_EVENT(playing)                  \
+    __ENUMERATE_HTML_EVENT(popstate)                 \
+    __ENUMERATE_HTML_EVENT(progress)                 \
+    __ENUMERATE_HTML_EVENT(ratechange)               \
+    __ENUMERATE_HTML_EVENT(readystatechange)         \
+    __ENUMERATE_HTML_EVENT(rejectionhandled)         \
+    __ENUMERATE_HTML_EVENT(reset)                    \
+    __ENUMERATE_HTML_EVENT(resize)                   \
+    __ENUMERATE_HTML_EVENT(scroll)                   \
+    __ENUMERATE_HTML_EVENT(securitypolicyviolation)  \
+    __ENUMERATE_HTML_EVENT(seeked)                   \
+    __ENUMERATE_HTML_EVENT(seeking)                  \
+    __ENUMERATE_HTML_EVENT(select)                   \
+    __ENUMERATE_HTML_EVENT(slotchange)               \
+    __ENUMERATE_HTML_EVENT(stalled)                  \
+    __ENUMERATE_HTML_EVENT(storage)                  \
+    __ENUMERATE_HTML_EVENT(submit)                   \
+    __ENUMERATE_HTML_EVENT(suspend)                  \
+    __ENUMERATE_HTML_EVENT(timeupdate)               \
+    __ENUMERATE_HTML_EVENT(toggle)                   \
+    __ENUMERATE_HTML_EVENT(unhandledrejection)       \
+    __ENUMERATE_HTML_EVENT(unload)                   \
+    __ENUMERATE_HTML_EVENT(visibilitychange)         \
+    __ENUMERATE_HTML_EVENT(volumechange)             \
+    __ENUMERATE_HTML_EVENT(waiting)                  \
+    __ENUMERATE_HTML_EVENT(webkitanimationend)       \
+    __ENUMERATE_HTML_EVENT(webkitanimationiteration) \
+    __ENUMERATE_HTML_EVENT(webkitanimationstart)     \
+    __ENUMERATE_HTML_EVENT(webkittransitionend)
 
 #define __ENUMERATE_HTML_EVENT(name) extern DeprecatedFlyString name;
 ENUMERATE_HTML_EVENTS
diff --git a/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.h b/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.h
index 0d6b18a44b..3f1ad6b4ea 100644
--- a/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.h
+++ b/Userland/Libraries/LibWeb/HTML/GlobalEventHandlers.h
@@ -9,73 +9,73 @@
 #include <AK/Forward.h>
 #include <LibWeb/Forward.h>
 
-#define ENUMERATE_GLOBAL_EVENT_HANDLERS(E)                    \
-    E(onabort, HTML::EventNames::abort)                       \
-    E(onauxclick, "auxclick")                                 \
-    E(onblur, HTML::EventNames::blur)                         \
-    E(oncancel, HTML::EventNames::cancel)                     \
-    E(oncanplay, "canplay")                                   \
-    E(oncanplaythrough, "canplaythrough")                     \
-    E(onchange, HTML::EventNames::change)                     \
-    E(onclick, UIEvents::EventNames::click)                   \
-    E(onclose, HTML::EventNames::close)                       \
-    E(oncontextmenu, HTML::EventNames::contextmenu)           \
-    E(oncuechange, "cuechange")                               \
-    E(ondblclick, "dblclick")                                 \
-    E(ondrag, "drag")                                         \
-    E(ondragend, "dragend")                                   \
-    E(ondragenter, "dragenter")                               \
-    E(ondragleave, "dragleave")                               \
-    E(ondragover, "dragover")                                 \
-    E(ondragstart, "dragstart")                               \
-    E(ondrop, "drop")                                         \
-    E(ondurationchange, "durationchange")                     \
-    E(onemptied, "emptied")                                   \
-    E(onended, "ended")                                       \
-    E(onerror, HTML::EventNames::error)                       \
-    E(onfocus, "focus")                                       \
-    E(onformdata, "formdata")                                 \
-    E(oninput, HTML::EventNames::input)                       \
-    E(oninvalid, HTML::EventNames::invalid)                   \
-    E(onkeydown, "keydown")                                   \
-    E(onkeypress, "keypress")                                 \
-    E(onkeyup, "keyup")                                       \
-    E(onload, HTML::EventNames::load)                         \
-    E(onloadeddata, "loadeddata")                             \
-    E(onloadedmetadata, "loadedmetadata")                     \
-    E(onloadstart, "loadstart")                               \
-    E(onmousedown, UIEvents::EventNames::mousedown)           \
-    E(onmouseenter, UIEvents::EventNames::mouseenter)         \
-    E(onmouseleave, UIEvents::EventNames::mouseleave)         \
-    E(onmousemove, UIEvents::EventNames::mousemove)           \
-    E(onmouseout, UIEvents::EventNames::mouseout)             \
-    E(onmouseover, UIEvents::EventNames::mouseover)           \
-    E(onmouseup, UIEvents::EventNames::mouseup)               \
-    E(onpause, "pause")                                       \
-    E(onplay, "play")                                         \
-    E(onplaying, "playing")                                   \
-    E(onprogress, "progress")                                 \
-    E(onratechange, "ratechange")                             \
-    E(onreset, "reset")                                       \
-    E(onresize, "resize")                                     \
-    E(onscroll, "scroll")                                     \
-    E(onsecuritypolicyviolation, "securitypolicyviolation")   \
-    E(onseeked, "seeked")                                     \
-    E(onseeking, "seeking")                                   \
-    E(onselect, HTML::EventNames::select)                     \
-    E(onslotchange, "slotchange")                             \
-    E(onstalled, "stalled")                                   \
-    E(onsubmit, HTML::EventNames::submit)                     \
-    E(onsuspend, "suspend")                                   \
-    E(ontimeupdate, "timeupdate")                             \
-    E(ontoggle, "toggle")                                     \
-    E(onvolumechange, "volumechange")                         \
-    E(onwaiting, "waiting")                                   \
-    E(onwebkitanimationend, "webkitanimationend")             \
-    E(onwebkitanimationiteration, "webkitanimationiteration") \
-    E(onwebkitanimationstart, "webkitanimationstart")         \
-    E(onwebkittransitionend, "webkittransitionend")           \
-    E(onwheel, "wheel")
+#define ENUMERATE_GLOBAL_EVENT_HANDLERS(E)                                    \
+    E(onabort, HTML::EventNames::abort)                                       \
+    E(onauxclick, UIEvents::EventNames::auxclick)                             \
+    E(onblur, HTML::EventNames::blur)                                         \
+    E(oncancel, HTML::EventNames::cancel)                                     \
+    E(oncanplay, HTML::EventNames::canplay)                                   \
+    E(oncanplaythrough, HTML::EventNames::canplaythrough)                     \
+    E(onchange, HTML::EventNames::change)                                     \
+    E(onclick, UIEvents::EventNames::click)                                   \
+    E(onclose, HTML::EventNames::close)                                       \
+    E(oncontextmenu, HTML::EventNames::contextmenu)                           \
+    E(oncuechange, HTML::EventNames::cuechange)                               \
+    E(ondblclick, UIEvents::EventNames::dblclick)                             \
+    E(ondrag, HTML::EventNames::drag)                                         \
+    E(ondragend, HTML::EventNames::dragend)                                   \
+    E(ondragenter, HTML::EventNames::dragenter)                               \
+    E(ondragleave, HTML::EventNames::dragleave)                               \
+    E(ondragover, HTML::EventNames::dragover)                                 \
+    E(ondragstart, HTML::EventNames::dragstart)                               \
+    E(ondrop, HTML::EventNames::drop)                                         \
+    E(ondurationchange, HTML::EventNames::durationchange)                     \
+    E(onemptied, HTML::EventNames::emptied)                                   \
+    E(onended, HTML::EventNames::ended)                                       \
+    E(onerror, HTML::EventNames::error)                                       \
+    E(onfocus, HTML::EventNames::focus)                                       \
+    E(onformdata, HTML::EventNames::formdata)                                 \
+    E(oninput, HTML::EventNames::input)                                       \
+    E(oninvalid, HTML::EventNames::invalid)                                   \
+    E(onkeydown, UIEvents::EventNames::keydown)                               \
+    E(onkeypress, UIEvents::EventNames::keypress)                             \
+    E(onkeyup, UIEvents::EventNames::keyup)                                   \
+    E(onload, HTML::EventNames::load)                                         \
+    E(onloadeddata, HTML::EventNames::loadeddata)                             \
+    E(onloadedmetadata, HTML::EventNames::loadedmetadata)                     \
+    E(onloadstart, HTML::EventNames::loadstart)                               \
+    E(onmousedown, UIEvents::EventNames::mousedown)                           \
+    E(onmouseenter, UIEvents::EventNames::mouseenter)                         \
+    E(onmouseleave, UIEvents::EventNames::mouseleave)                         \
+    E(onmousemove, UIEvents::EventNames::mousemove)                           \
+    E(onmouseout, UIEvents::EventNames::mouseout)                             \
+    E(onmouseover, UIEvents::EventNames::mouseover)                           \
+    E(onmouseup, UIEvents::EventNames::mouseup)                               \
+    E(onpause, HTML::EventNames::pause)                                       \
+    E(onplay, HTML::EventNames::play)                                         \
+    E(onplaying, HTML::EventNames::playing)                                   \
+    E(onprogress, HTML::EventNames::progress)                                 \
+    E(onratechange, HTML::EventNames::ratechange)                             \
+    E(onreset, HTML::EventNames::reset)                                       \
+    E(onresize, HTML::EventNames::resize)                                     \
+    E(onscroll, HTML::EventNames::scroll)                                     \
+    E(onsecuritypolicyviolation, HTML::EventNames::securitypolicyviolation)   \
+    E(onseeked, HTML::EventNames::seeked)                                     \
+    E(onseeking, HTML::EventNames::seeking)                                   \
+    E(onselect, HTML::EventNames::select)                                     \
+    E(onslotchange, HTML::EventNames::slotchange)                             \
+    E(onstalled, HTML::EventNames::stalled)                                   \
+    E(onsubmit, HTML::EventNames::submit)                                     \
+    E(onsuspend, HTML::EventNames::suspend)                                   \
+    E(ontimeupdate, HTML::EventNames::timeupdate)                             \
+    E(ontoggle, HTML::EventNames::toggle)                                     \
+    E(onvolumechange, HTML::EventNames::volumechange)                         \
+    E(onwaiting, HTML::EventNames::waiting)                                   \
+    E(onwebkitanimationend, HTML::EventNames::webkitanimationend)             \
+    E(onwebkitanimationiteration, HTML::EventNames::webkitanimationiteration) \
+    E(onwebkitanimationstart, HTML::EventNames::webkitanimationstart)         \
+    E(onwebkittransitionend, HTML::EventNames::webkittransitionend)           \
+    E(onwheel, UIEvents::EventNames::wheel)
 
 namespace Web::HTML {
 
diff --git a/Userland/Libraries/LibWeb/UIEvents/EventNames.h b/Userland/Libraries/LibWeb/UIEvents/EventNames.h
index 27dad4c5b1..f60b0cb4c8 100644
--- a/Userland/Libraries/LibWeb/UIEvents/EventNames.h
+++ b/Userland/Libraries/LibWeb/UIEvents/EventNames.h
@@ -15,6 +15,7 @@ namespace Web::UIEvents::EventNames {
 // FIXME: This is not all of the events
 
 #define ENUMERATE_UI_EVENTS          \
+    __ENUMERATE_UI_EVENT(auxclick)   \
     __ENUMERATE_UI_EVENT(click)      \
     __ENUMERATE_UI_EVENT(dblclick)   \
     __ENUMERATE_UI_EVENT(keydown)    \