RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 16:37:47 +00:00
Code Issues Activity Actions

LibWeb: Move DOM classes into the Web::DOM namespace

Browse source 
LibWeb keeps growing and the Web namespace is filling up fast.
Let's put DOM stuff into Web::DOM, just like we already started doing
with SVG stuff in Web::SVG.
This commit is contained in:
Andreas Kling 2020-07-26 19:37:56 +02:00
parent 96d13f75cf
commit 11ff9d0f17
178 changed files with 516 additions and 523 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Libraries/LibWeb/Bindings/EventListenerWrapper.cpp
View file

@ -33,7 +33,7 @@
namespace Web {
namespace Bindings {
EventListenerWrapper::EventListenerWrapper(JS::GlobalObject& global_object, EventListener& impl)
EventListenerWrapper::EventListenerWrapper(JS::GlobalObject& global_object, DOM::EventListener& impl)
: Wrapper(*global_object.object_prototype())
, m_impl(impl)
{

8
Libraries/LibWeb/Bindings/EventListenerWrapper.h
View file

@ -35,14 +35,14 @@ class EventListenerWrapper final : public Wrapper {
JS_OBJECT(EventListenerWrapper, Wrapper);
public:
EventListenerWrapper(JS::GlobalObject&, EventListener&);
EventListenerWrapper(JS::GlobalObject&, DOM::EventListener&);
virtual ~EventListenerWrapper() override;
EventListener& impl() { return *m_impl; }
const EventListener& impl() const { return *m_impl; }
DOM::EventListener& impl() { return *m_impl; }
const DOM::EventListener& impl() const { return *m_impl; }
private:
NonnullRefPtr<EventListener> m_impl;
NonnullRefPtr<DOM::EventListener> m_impl;
};
}

4
Libraries/LibWeb/Bindings/EventWrapperFactory.cpp
View file

@ -30,10 +30,10 @@
namespace Web {
namespace Bindings {
EventWrapper* wrap(JS::GlobalObject& global_object, Event& event)
EventWrapper* wrap(JS::GlobalObject& global_object, DOM::Event& event)
{
if (event.is_mouse_event())
return static_cast<MouseEventWrapper*>(wrap_impl(global_object, static_cast<MouseEvent&>(event)));
return static_cast<MouseEventWrapper*>(wrap_impl(global_object, static_cast<DOM::MouseEvent&>(event)));
return static_cast<EventWrapper*>(wrap_impl(global_object, event));
}

6
Libraries/LibWeb/Bindings/EventWrapperFactory.h
View file

@ -29,10 +29,8 @@
#include <LibJS/Forward.h>
#include <LibWeb/Forward.h>
namespace Web {
namespace Bindings {
namespace Web::Bindings {
EventWrapper* wrap(JS::GlobalObject&, Event&);
EventWrapper* wrap(JS::GlobalObject&, DOM::Event&);
}
}

14
Libraries/LibWeb/Bindings/NodeWrapperFactory.cpp
View file

@ -38,20 +38,20 @@
namespace Web {
namespace Bindings {
NodeWrapper* wrap(JS::GlobalObject& global_object, Node& node)
NodeWrapper* wrap(JS::GlobalObject& global_object, DOM::Node& node)
{
if (is<Document>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<Document>(node)));
if (is<DocumentType>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<DocumentType>(node)));
if (is<DOM::Document>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<DOM::Document>(node)));
if (is<DOM::DocumentType>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<DOM::DocumentType>(node)));
if (is<HTMLCanvasElement>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<HTMLCanvasElement>(node)));
if (is<HTMLImageElement>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<HTMLImageElement>(node)));
if (is<HTMLElement>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<HTMLElement>(node)));
if (is<Element>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<Element>(node)));
if (is<DOM::Element>(node))
return static_cast<NodeWrapper*>(wrap_impl(global_object, downcast<DOM::Element>(node)));
return static_cast<NodeWrapper*>(wrap_impl(global_object, node));
}

2
Libraries/LibWeb/Bindings/NodeWrapperFactory.h
View file

@ -32,7 +32,7 @@
namespace Web {
namespace Bindings {
NodeWrapper* wrap(JS::GlobalObject&, Node&);
NodeWrapper* wrap(JS::GlobalObject&, DOM::Node&);
}
}

4
Libraries/LibWeb/Bindings/WindowObject.cpp
View file

@ -48,7 +48,7 @@
namespace Web {
namespace Bindings {
WindowObject::WindowObject(Window& impl)
WindowObject::WindowObject(DOM::Window& impl)
: m_impl(impl)
{
impl.set_wrapper({}, *this);
@ -91,7 +91,7 @@ void WindowObject::visit_children(Visitor& visitor)
visitor.visit(m_xhr_prototype);
}
static Window* impl_from(JS::Interpreter& interpreter, JS::GlobalObject& global_object)
static DOM::Window* impl_from(JS::Interpreter& interpreter, JS::GlobalObject& global_object)
{
auto* this_object = interpreter.this_value(global_object).to_object(interpreter, global_object);
if (!this_object) {

8
Libraries/LibWeb/Bindings/WindowObject.h
View file

@ -37,12 +37,12 @@ class WindowObject final
: public JS::GlobalObject
, public Weakable<WindowObject> {
public:
explicit WindowObject(Window&);
explicit WindowObject(DOM::Window&);
virtual void initialize() override;
virtual ~WindowObject() override;
Window& impl() { return *m_impl; }
const Window& impl() const { return *m_impl; }
DOM::Window& impl() { return *m_impl; }
const DOM::Window& impl() const { return *m_impl; }
XMLHttpRequestPrototype* xhr_prototype() { return m_xhr_prototype; }
XMLHttpRequestConstructor* xhr_constructor() { return m_xhr_constructor; }
@ -65,7 +65,7 @@ private:
JS_DECLARE_NATIVE_FUNCTION(atob);
JS_DECLARE_NATIVE_FUNCTION(btoa);
NonnullRefPtr<Window> m_impl;
NonnullRefPtr<DOM::Window> m_impl;
XMLHttpRequestConstructor* m_xhr_constructor { nullptr };
XMLHttpRequestPrototype* m_xhr_prototype { nullptr };