diff --git a/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h b/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h deleted file mode 100644 index e9b65acfd3..0000000000 --- a/Userland/Libraries/LibWeb/Bindings/WindowObjectHelper.h +++ /dev/null @@ -1,604 +0,0 @@ -/* - * Copyright (c) 2021-2022, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -// FIXME: Find a way to generate all of this - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define ADD_WINDOW_OBJECT_CONSTRUCTOR_AND_PROTOTYPE(interface_name, constructor_name, prototype_name) \ - { \ - auto& prototype = Bindings::ensure_web_prototype(realm, #interface_name); \ - auto& constructor = Bindings::ensure_web_constructor(realm, #interface_name); \ - define_direct_property(#interface_name, &constructor, JS::Attribute::Writable | JS::Attribute::Configurable); \ - prototype.define_direct_property(vm.names.constructor, &constructor, JS::Attribute::Writable | JS::Attribute::Configurable); \ - constructor.define_direct_property(vm.names.name, js_string(vm, #interface_name), JS::Attribute::Configurable); \ - } - -#define ADD_WINDOW_OBJECT_INTERFACE(interface_name) \ - ADD_WINDOW_OBJECT_CONSTRUCTOR_AND_PROTOTYPE(interface_name, interface_name##Constructor, interface_name##Prototype) - -#define ADD_WINDOW_OBJECT_INTERFACES \ - auto& vm = this->vm(); \ - auto& realm = this->realm(); \ - ADD_WINDOW_OBJECT_INTERFACE(AbortController) \ - ADD_WINDOW_OBJECT_INTERFACE(AbortSignal) \ - ADD_WINDOW_OBJECT_INTERFACE(AbstractRange) \ - ADD_WINDOW_OBJECT_INTERFACE(Attr) \ - ADD_WINDOW_OBJECT_INTERFACE(Blob) \ - ADD_WINDOW_OBJECT_INTERFACE(CDATASection) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSConditionRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSFontFaceRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSGroupingRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSImportRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSMediaRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSRuleList) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSStyleDeclaration) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSStyleRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSStyleSheet) \ - ADD_WINDOW_OBJECT_INTERFACE(CSSSupportsRule) \ - ADD_WINDOW_OBJECT_INTERFACE(CanvasGradient) \ - ADD_WINDOW_OBJECT_INTERFACE(CanvasRenderingContext2D) \ - ADD_WINDOW_OBJECT_INTERFACE(CharacterData) \ - ADD_WINDOW_OBJECT_INTERFACE(CloseEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(Comment) \ - ADD_WINDOW_OBJECT_INTERFACE(Crypto) \ - ADD_WINDOW_OBJECT_INTERFACE(CustomEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(DocumentFragment) \ - ADD_WINDOW_OBJECT_INTERFACE(Document) \ - ADD_WINDOW_OBJECT_INTERFACE(DocumentType) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMException) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMImplementation) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMParser) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMPoint) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMPointReadOnly) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMRect) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMRectList) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMRectReadOnly) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMStringMap) \ - ADD_WINDOW_OBJECT_INTERFACE(DOMTokenList) \ - ADD_WINDOW_OBJECT_INTERFACE(Element) \ - ADD_WINDOW_OBJECT_INTERFACE(ErrorEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(Event) \ - ADD_WINDOW_OBJECT_INTERFACE(EventTarget) \ - ADD_WINDOW_OBJECT_INTERFACE(File) \ - ADD_WINDOW_OBJECT_INTERFACE(FileList) \ - ADD_WINDOW_OBJECT_INTERFACE(Headers) \ - ADD_WINDOW_OBJECT_INTERFACE(History) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLAnchorElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLAreaElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLAudioElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLBaseElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLBodyElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLBRElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLButtonElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLCanvasElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLCollection) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDataElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDataListElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDetailsElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDialogElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDirectoryElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDivElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLDListElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLEmbedElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLFieldSetElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLFontElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLFormElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLFrameElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLFrameSetElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLHeadElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLHeadingElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLHRElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLHtmlElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLIFrameElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLImageElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLInputElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLLabelElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLLegendElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLLIElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLLinkElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLMapElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLMarqueeElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLMediaElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLMenuElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLMetaElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLMeterElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLModElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLObjectElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLOListElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLOptGroupElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLOptionElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLOptionsCollection) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLOutputElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLParagraphElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLParamElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLPictureElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLPreElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLProgressElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLQuoteElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLScriptElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLSelectElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLSlotElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLSourceElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLSpanElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLStyleElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTableCaptionElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTableCellElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTableColElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTableElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTableRowElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTableSectionElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTemplateElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTextAreaElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTimeElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTitleElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLTrackElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLUListElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLUnknownElement) \ - ADD_WINDOW_OBJECT_INTERFACE(HTMLVideoElement) \ - ADD_WINDOW_OBJECT_INTERFACE(IdleDeadline) \ - ADD_WINDOW_OBJECT_INTERFACE(ImageData) \ - ADD_WINDOW_OBJECT_INTERFACE(IntersectionObserver) \ - ADD_WINDOW_OBJECT_INTERFACE(KeyboardEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(Location) \ - ADD_WINDOW_OBJECT_INTERFACE(MediaQueryList) \ - ADD_WINDOW_OBJECT_INTERFACE(MediaQueryListEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(MediaList) \ - ADD_WINDOW_OBJECT_INTERFACE(MessageChannel) \ - ADD_WINDOW_OBJECT_INTERFACE(MessageEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(MessagePort) \ - ADD_WINDOW_OBJECT_INTERFACE(MouseEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(MutationObserver) \ - ADD_WINDOW_OBJECT_INTERFACE(MutationRecord) \ - ADD_WINDOW_OBJECT_INTERFACE(NamedNodeMap) \ - ADD_WINDOW_OBJECT_INTERFACE(Navigator) \ - ADD_WINDOW_OBJECT_INTERFACE(Node) \ - ADD_WINDOW_OBJECT_INTERFACE(NodeIterator) \ - ADD_WINDOW_OBJECT_INTERFACE(NodeList) \ - ADD_WINDOW_OBJECT_INTERFACE(PageTransitionEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(Path2D) \ - ADD_WINDOW_OBJECT_INTERFACE(Performance) \ - ADD_WINDOW_OBJECT_INTERFACE(PerformanceTiming) \ - ADD_WINDOW_OBJECT_INTERFACE(ProcessingInstruction) \ - ADD_WINDOW_OBJECT_INTERFACE(ProgressEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(PromiseRejectionEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(Range) \ - ADD_WINDOW_OBJECT_INTERFACE(ReadableStream) \ - ADD_WINDOW_OBJECT_INTERFACE(Request) \ - ADD_WINDOW_OBJECT_INTERFACE(ResizeObserver) \ - ADD_WINDOW_OBJECT_INTERFACE(Response) \ - ADD_WINDOW_OBJECT_INTERFACE(Screen) \ - ADD_WINDOW_OBJECT_INTERFACE(Selection) \ - ADD_WINDOW_OBJECT_INTERFACE(ShadowRoot) \ - ADD_WINDOW_OBJECT_INTERFACE(StaticRange) \ - ADD_WINDOW_OBJECT_INTERFACE(Storage) \ - ADD_WINDOW_OBJECT_INTERFACE(StyleSheet) \ - ADD_WINDOW_OBJECT_INTERFACE(StyleSheetList) \ - ADD_WINDOW_OBJECT_INTERFACE(SubmitEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(SubtleCrypto) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGAnimatedLength) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGCircleElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGClipPathElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGDefsElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGEllipseElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGGeometryElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGGraphicsElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGLength) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGLineElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGPathElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGPolygonElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGPolylineElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGRectElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGSVGElement) \ - ADD_WINDOW_OBJECT_INTERFACE(SVGTextContentElement) \ - ADD_WINDOW_OBJECT_INTERFACE(Text) \ - ADD_WINDOW_OBJECT_INTERFACE(TextDecoder) \ - ADD_WINDOW_OBJECT_INTERFACE(TextEncoder) \ - ADD_WINDOW_OBJECT_INTERFACE(TextMetrics) \ - ADD_WINDOW_OBJECT_INTERFACE(TreeWalker) \ - ADD_WINDOW_OBJECT_INTERFACE(UIEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(URLSearchParams) \ - ADD_WINDOW_OBJECT_INTERFACE(URL) \ - ADD_WINDOW_OBJECT_INTERFACE(WebGLContextEvent) \ - ADD_WINDOW_OBJECT_INTERFACE(WebGLRenderingContext) \ - ADD_WINDOW_OBJECT_INTERFACE(WebSocket) \ - ADD_WINDOW_OBJECT_INTERFACE(Worker) \ - ADD_WINDOW_OBJECT_INTERFACE(XMLHttpRequest) \ - ADD_WINDOW_OBJECT_INTERFACE(XMLHttpRequestEventTarget) \ - ADD_WINDOW_OBJECT_INTERFACE(XMLSerializer) \ - ADD_WINDOW_OBJECT_INTERFACE(Window) \ - ADD_WINDOW_OBJECT_CONSTRUCTOR_AND_PROTOTYPE(Audio, AudioConstructor, HTMLAudioElementPrototype) \ - ADD_WINDOW_OBJECT_CONSTRUCTOR_AND_PROTOTYPE(Image, ImageConstructor, HTMLImageElementPrototype) \ - ADD_WINDOW_OBJECT_CONSTRUCTOR_AND_PROTOTYPE(Option, OptionConstructor, HTMLOptionElementPrototype) diff --git a/Userland/Libraries/LibWeb/HTML/Window.cpp b/Userland/Libraries/LibWeb/HTML/Window.cpp index 1493e5b97f..c28301da4b 100644 --- a/Userland/Libraries/LibWeb/HTML/Window.cpp +++ b/Userland/Libraries/LibWeb/HTML/Window.cpp @@ -15,13 +15,11 @@ #include #include #include -#include -#include #include #include #include #include -#include +#include #include #include #include @@ -741,7 +739,8 @@ void Window::initialize(JS::Realm& realm) void Window::initialize_web_interfaces(Badge) { - ADD_WINDOW_OBJECT_INTERFACES; + auto& realm = this->realm(); + add_window_exposed_interfaces(*this, realm); Object::set_prototype(&Bindings::ensure_web_prototype(realm, "Window"));