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

LibJS+LibWeb: Move native JS functions into dedicated member functions

Browse source 
Instead of implementing every native function as a lambda function,
use static member functions instead.

This makes it easier to navigate the code + backtraces look nicer. :^)
This commit is contained in:
Andreas Kling 2020-03-28 23:10:37 +01:00
parent 7c4e53f31e
commit 56936b97d0
20 changed files with 233 additions and 149 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Libraries/LibWeb/Bindings/CanvasRenderingContext2DWrapper.cpp
View file

@ -51,18 +51,25 @@ CanvasRenderingContext2DWrapper::CanvasRenderingContext2DWrapper(CanvasRendering
[this](JS::Object*, JS::Value value) {
m_impl->set_fill_style(value.to_string());
});
put_native_function("fillRect", [this](JS::Interpreter& interpreter) {
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() >= 4) {
m_impl->fill_rect(arguments[0].to_i32(), arguments[1].to_i32(), arguments[2].to_i32(), arguments[3].to_i32());
}
return JS::js_undefined();
});
put_native_function("fillRect", fill_rect);
}
CanvasRenderingContext2DWrapper::~CanvasRenderingContext2DWrapper()
{
}
JS::Value CanvasRenderingContext2DWrapper::fill_rect(JS::Interpreter& interpreter)
{
auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object)
return {};
// FIXME: Verify that it's a CanvasRenderingContext2DWrapper somehow!
auto& impl = static_cast<CanvasRenderingContext2DWrapper*>(this_object)->impl();
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() >= 4)
impl.fill_rect(arguments[0].to_i32(), arguments[1].to_i32(), arguments[2].to_i32(), arguments[3].to_i32());
return JS::js_undefined();
}
}
}

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

@ -42,6 +42,8 @@ public:
private:
virtual const char* class_name() const override { return "CanvasRenderingContext2DWrapper"; }
static JS::Value fill_rect(JS::Interpreter&);
NonnullRefPtr<CanvasRenderingContext2D> m_impl;
};

28
Libraries/LibWeb/Bindings/DocumentWrapper.cpp
View file

@ -38,16 +38,7 @@ namespace Bindings {
DocumentWrapper::DocumentWrapper(Document& document)
: NodeWrapper(document)
{
put_native_function("getElementById", [this](JS::Interpreter& interpreter) -> JS::Value {
auto& arguments = interpreter.call_frame().arguments;
if (arguments.is_empty())
return JS::js_null();
auto id = arguments[0].to_string();
auto* element = node().get_element_by_id(id);
if (!element)
return JS::js_null();
return wrap(heap(), const_cast<Element&>(*element));
});
put_native_function("getElementById", get_element_by_id);
}
DocumentWrapper::~DocumentWrapper()
@ -64,5 +55,22 @@ const Document& DocumentWrapper::node() const
return static_cast<const Document&>(NodeWrapper::node());
}
JS::Value DocumentWrapper::get_element_by_id(JS::Interpreter& interpreter)
{
auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object)
return {};
// FIXME: Verify that it's a DocumentWrapper somehow!
auto& node = static_cast<DocumentWrapper*>(this_object)->node();
auto& arguments = interpreter.call_frame().arguments;
if (arguments.is_empty())
return JS::js_null();
auto id = arguments[0].to_string();
auto* element = node.get_element_by_id(id);
if (!element)
return JS::js_null();
return wrap(interpreter.heap(), const_cast<Element&>(*element));
}
}
}

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

@ -41,6 +41,8 @@ public:
private:
virtual const char* class_name() const override { return "DocumentWrapper"; }
static JS::Value get_element_by_id(JS::Interpreter&);
};
}

35
Libraries/LibWeb/Bindings/EventTargetWrapper.cpp
View file

@ -39,28 +39,29 @@ namespace Bindings {
EventTargetWrapper::EventTargetWrapper(EventTarget& impl)
: m_impl(impl)
{
put_native_function("addEventListener", [](JS::Interpreter& interpreter) -> JS::Value {
auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object)
return {};
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() < 2)
return JS::js_undefined();
auto event_name = arguments[0].to_string();
ASSERT(arguments[1].is_object());
ASSERT(arguments[1].as_object()->is_function());
auto* function = static_cast<JS::Function*>(const_cast<Object*>(arguments[1].as_object()));
auto listener = adopt(*new EventListener(JS::make_handle(function)));
static_cast<EventTargetWrapper*>(this_object)->impl().add_event_listener(event_name, move(listener));
return JS::js_undefined();
});
put_native_function("addEventListener", add_event_listener);
}
EventTargetWrapper::~EventTargetWrapper()
{
}
JS::Value EventTargetWrapper::add_event_listener(JS::Interpreter& interpreter)
{
auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object)
return {};
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() < 2)
return JS::js_undefined();
auto event_name = arguments[0].to_string();
ASSERT(arguments[1].is_object());
ASSERT(arguments[1].as_object()->is_function());
auto* function = static_cast<JS::Function*>(const_cast<Object*>(arguments[1].as_object()));
auto listener = adopt(*new EventListener(JS::make_handle(function)));
static_cast<EventTargetWrapper*>(this_object)->impl().add_event_listener(event_name, move(listener));
return JS::js_undefined();
}
}
}

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

@ -42,6 +42,8 @@ public:
private:
virtual const char* class_name() const override { return "EventTargetWrapper"; }
static JS::Value add_event_listener(JS::Interpreter&);
NonnullRefPtr<EventTarget> m_impl;
};

25
Libraries/LibWeb/Bindings/HTMLCanvasElementWrapper.cpp
View file

@ -40,14 +40,8 @@ namespace Bindings {
HTMLCanvasElementWrapper::HTMLCanvasElementWrapper(HTMLCanvasElement& element)
: ElementWrapper(element)
{
put_native_function("getContext", [this](JS::Interpreter& interpreter) -> JS::Value {
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() >= 1) {
auto* context = node().get_context(arguments[0].to_string());
return wrap(heap(), *context);
}
return JS::js_undefined();
});
put_native_function("getContext", get_context);
put_native_property(
"width",
[this](JS::Object*) {
@ -76,5 +70,20 @@ const HTMLCanvasElement& HTMLCanvasElementWrapper::node() const
return static_cast<const HTMLCanvasElement&>(NodeWrapper::node());
}
JS::Value HTMLCanvasElementWrapper::get_context(JS::Interpreter& interpreter)
{
auto* this_object = interpreter.this_value().to_object(interpreter.heap());
if (!this_object)
return {};
// FIXME: Verify that it's an HTMLCanvasElementWrapper somehow!
auto& node = static_cast<HTMLCanvasElementWrapper*>(this_object)->node();
auto& arguments = interpreter.call_frame().arguments;
if (arguments.size() >= 1) {
auto* context = node.get_context(arguments[0].to_string());
return wrap(interpreter.heap(), *context);
}
return JS::js_undefined();
}
}
}

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

@ -41,6 +41,8 @@ public:
private:
virtual const char* class_name() const override { return "HTMLCanvasElementWrapper"; }
static JS::Value get_context(JS::Interpreter&);
};
}