From d724a1273288751174a3bc51da3aa2c1c3a6ab62 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Sun, 21 Jun 2020 12:27:41 +0200 Subject: [PATCH] LibWeb: Generate EventTarget bindings from IDL :^) --- .../LibWeb/Bindings/EventTargetWrapper.cpp | 77 ------------------- .../LibWeb/Bindings/EventTargetWrapper.h | 52 ------------- Libraries/LibWeb/Bindings/Wrapper.h | 1 + Libraries/LibWeb/CMakeLists.txt | 2 + .../CodeGenerators/WrapperGenerator.cpp | 26 +++++-- Libraries/LibWeb/DOM/EventTarget.idl | 5 ++ 6 files changed, 29 insertions(+), 134 deletions(-) delete mode 100644 Libraries/LibWeb/Bindings/EventTargetWrapper.cpp delete mode 100644 Libraries/LibWeb/Bindings/EventTargetWrapper.h create mode 100644 Libraries/LibWeb/DOM/EventTarget.idl diff --git a/Libraries/LibWeb/Bindings/EventTargetWrapper.cpp b/Libraries/LibWeb/Bindings/EventTargetWrapper.cpp deleted file mode 100644 index 7aa09137481..00000000000 --- a/Libraries/LibWeb/Bindings/EventTargetWrapper.cpp +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace Web { -namespace Bindings { - -EventTargetWrapper::EventTargetWrapper(JS::GlobalObject& global_object, EventTarget& impl) - : Wrapper(*global_object.object_prototype()) - , m_impl(impl) -{ -} - -void EventTargetWrapper::initialize(JS::Interpreter& interpreter, JS::GlobalObject& global_object) -{ - Wrapper::initialize(interpreter, global_object); - define_native_function("addEventListener", add_event_listener, 2); -} - -EventTargetWrapper::~EventTargetWrapper() -{ -} - -JS_DEFINE_NATIVE_FUNCTION(EventTargetWrapper::add_event_listener) -{ - auto* this_object = interpreter.this_value(global_object).to_object(interpreter, global_object); - if (!this_object) - return {}; - if (interpreter.argument_count() < 2) - return interpreter.throw_exception(JS::ErrorType::BadArgCountMany, "addEventListener", "two"); - auto event_name = interpreter.argument(0).to_string(interpreter); - if (interpreter.exception()) - return {}; - auto callback = interpreter.argument(1); - ASSERT(callback.is_object()); - ASSERT(callback.as_object().is_function()); - auto& function = callback.as_function(); - auto listener = adopt(*new EventListener(JS::make_handle(&function))); - static_cast(this_object)->impl().add_event_listener(event_name, move(listener)); - return JS::js_undefined(); -} - -} -} diff --git a/Libraries/LibWeb/Bindings/EventTargetWrapper.h b/Libraries/LibWeb/Bindings/EventTargetWrapper.h deleted file mode 100644 index f308682e98e..00000000000 --- a/Libraries/LibWeb/Bindings/EventTargetWrapper.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#pragma once - -#include - -namespace Web { -namespace Bindings { - -class EventTargetWrapper : public Wrapper { -public: - EventTargetWrapper(JS::GlobalObject&, EventTarget&); - virtual void initialize(JS::Interpreter&, JS::GlobalObject&) override; - virtual ~EventTargetWrapper() override; - - EventTarget& impl() { return *m_impl; } - const EventTarget& impl() const { return *m_impl; } - -private: - virtual const char* class_name() const override { return "EventTargetWrapper"; } - - JS_DECLARE_NATIVE_FUNCTION(add_event_listener); - - NonnullRefPtr m_impl; -}; - -} -} diff --git a/Libraries/LibWeb/Bindings/Wrapper.h b/Libraries/LibWeb/Bindings/Wrapper.h index 09d9a6b5cbf..8ddb818daf9 100644 --- a/Libraries/LibWeb/Bindings/Wrapper.h +++ b/Libraries/LibWeb/Bindings/Wrapper.h @@ -38,6 +38,7 @@ class Wrapper : public JS::Object , public Weakable { public: + virtual bool is_event_target_wrapper() const { return false; } virtual bool is_node_wrapper() const { return false; } virtual bool is_document_wrapper() const { return false; } virtual bool is_element_wrapper() const { return false; } diff --git a/Libraries/LibWeb/CMakeLists.txt b/Libraries/LibWeb/CMakeLists.txt index 51318925226..0169dc17c2a 100644 --- a/Libraries/LibWeb/CMakeLists.txt +++ b/Libraries/LibWeb/CMakeLists.txt @@ -6,6 +6,7 @@ set(SOURCES Bindings/ElementWrapper.h Bindings/EventListenerWrapper.cpp Bindings/EventTargetWrapper.cpp + Bindings/EventTargetWrapper.h Bindings/EventWrapper.cpp Bindings/HTMLCanvasElementWrapper.cpp Bindings/HTMLImageElementWrapper.cpp @@ -147,6 +148,7 @@ function(libweb_js_wrapper class) add_custom_target(generate_${class}Wrapper.h DEPENDS Bindings/${class}Wrapper.h) endfunction() +libweb_js_wrapper(EventTarget) libweb_js_wrapper(Node) libweb_js_wrapper(Document) libweb_js_wrapper(Element) diff --git a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp index 24c32f70bc1..324d7c3ab4a 100644 --- a/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp +++ b/Libraries/LibWeb/CodeGenerators/WrapperGenerator.cpp @@ -237,7 +237,7 @@ OwnPtr parse_interface(const StringView& input) } interface->wrapper_class = String::format("%sWrapper", interface->name.characters()); - interface->wrapper_base_class = String::format("%sWrapper", interface->parent_name.characters()); + interface->wrapper_base_class = String::format("%sWrapper", interface->parent_name.is_empty() ? "" : interface->parent_name.characters()); return interface; } @@ -308,9 +308,8 @@ static void generate_header(const IDL::Interface& interface) out() << "#include "; out() << "#include "; - if (!wrapper_base_class.is_empty()) { + if (wrapper_base_class != "Wrapper") out() << "#include "; - } out() << "namespace Web {"; out() << "namespace Bindings {"; @@ -321,7 +320,7 @@ static void generate_header(const IDL::Interface& interface) out() << " virtual void initialize(JS::Interpreter&, JS::GlobalObject&) override;"; out() << " virtual ~" << wrapper_class << "() override;"; - if (wrapper_base_class.is_empty()) { + if (wrapper_base_class == "Wrapper") { out() << " " << interface.name << "& impl() { return *m_impl; }"; out() << " const " << interface.name << "& impl() const { return *m_impl; }"; } else { @@ -345,6 +344,10 @@ static void generate_header(const IDL::Interface& interface) out() << " JS_DECLARE_NATIVE_SETTER(" << snake_name(attribute.name) << "_setter);"; } + if (wrapper_base_class == "Wrapper") { + out() << " NonnullRefPtr<" << interface.name << "> m_impl;"; + } + out() << "};"; out() << "}"; out() << "}"; @@ -361,17 +364,24 @@ void generate_implementation(const IDL::Interface& interface) out() << "#include "; out() << "#include "; out() << "#include "; + out() << "#include "; out() << "#include "; out() << "#include "; out() << "#include "; out() << "#include "; + out() << "#include "; out() << "namespace Web {"; out() << "namespace Bindings {"; // Implementation: Wrapper constructor out() << wrapper_class << "::" << wrapper_class << "(JS::GlobalObject& global_object, " << interface.name << "& impl)"; - out() << " : " << wrapper_base_class << "(global_object, impl)"; + if (wrapper_base_class == "Wrapper") { + out() << " : Wrapper(*global_object.object_prototype())"; + out() << " , m_impl(impl)"; + } else { + out() << " : " << wrapper_base_class << "(global_object, impl)"; + } out() << "{"; out() << "}"; @@ -421,6 +431,12 @@ void generate_implementation(const IDL::Interface& interface) out() << " auto " << cpp_name << " = " << js_name << js_suffix << ".to_string(interpreter);"; out() << " if (interpreter.exception())"; generate_return(); + } else if (parameter.type.name == "EventListener") { + out() << " if (!" << js_name << js_suffix << ".is_function()) {"; + out() << " interpreter.throw_exception(JS::ErrorType::NotA, \"Function\");"; + generate_return(); + out() << " }"; + out() << " auto " << cpp_name << " = adopt(*new EventListener(JS::make_handle(&" << js_name << js_suffix << ".as_function())));"; } else if (parameter.type.name == "Node") { out() << " auto " << cpp_name << "_object = " << js_name << js_suffix << ".to_object(interpreter, global_object);"; out() << " if (interpreter.exception())"; diff --git a/Libraries/LibWeb/DOM/EventTarget.idl b/Libraries/LibWeb/DOM/EventTarget.idl new file mode 100644 index 00000000000..32c6c76370b --- /dev/null +++ b/Libraries/LibWeb/DOM/EventTarget.idl @@ -0,0 +1,5 @@ +interface EventTarget { + + void addEventListener(DOMString type, EventListener? callback); + +}