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

LibWeb: Port EventTarget to new {Fly}String

Browse source
This commit is contained in:
Kenneth Myhra 2023-04-09 09:52:27 +02:00 • committed by Linus Groh
parent 868cd95069
commit 2091a11488
8 changed files with 65 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Libraries/LibWeb/CSS/MediaQueryList.cpp
View file

@ -79,7 +79,7 @@ void MediaQueryList::add_listener(DOM::IDLEventListener* listener)
// callback set to listener, and capture set to false, unless there already is an event listener // callback set to listener, and capture set to false, unless there already is an event listener
// in that list with the same type, callback, and capture. // in that list with the same type, callback, and capture.
// (NOTE: capture is set to false by default) // (NOTE: capture is set to false by default)
add_event_listener_without_options(HTML::EventNames::change.to_deprecated_fly_string(), *listener); add_event_listener_without_options(HTML::EventNames::change, *listener);
} }
// https://www.w3.org/TR/cssom-view/#dom-mediaquerylist-removelistener // https://www.w3.org/TR/cssom-view/#dom-mediaquerylist-removelistener
@ -88,7 +88,7 @@ void MediaQueryList::remove_listener(DOM::IDLEventListener* listener)
// 1. Remove an event listener from the associated list of event listeners, whose type is change, callback is listener, and capture is false. // 1. Remove an event listener from the associated list of event listeners, whose type is change, callback is listener, and capture is false.
// NOTE: While the spec doesn't technically use remove_event_listener and instead manipulates the list directly, every major engine uses remove_event_listener. // NOTE: While the spec doesn't technically use remove_event_listener and instead manipulates the list directly, every major engine uses remove_event_listener.
// This means if an event listener removes another event listener that comes after it, the removed event listener will not be invoked. // This means if an event listener removes another event listener that comes after it, the removed event listener will not be invoked.
remove_event_listener_without_options(HTML::EventNames::change.to_deprecated_fly_string(), *listener); remove_event_listener_without_options(HTML::EventNames::change, *listener);
} }
void MediaQueryList::set_onchange(WebIDL::CallbackType* event_handler) void MediaQueryList::set_onchange(WebIDL::CallbackType* event_handler)

76
Userland/Libraries/LibWeb/DOM/EventTarget.cpp
View file

@ -120,7 +120,7 @@ static FlattenedAddEventListenerOptions flatten_add_event_listener_options(Varia
} }
// https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener // https://dom.spec.whatwg.org/#dom-eventtarget-addeventlistener
void EventTarget::add_event_listener(DeprecatedFlyString const& type, IDLEventListener* callback, Variant<AddEventListenerOptions, bool> const& options) void EventTarget::add_event_listener(FlyString const& type, IDLEventListener* callback, Variant<AddEventListenerOptions, bool> const& options)
{ {
// 1. Let capture, passive, once, and signal be the result of flattening more options. // 1. Let capture, passive, once, and signal be the result of flattening more options.
auto flattened_options = flatten_add_event_listener_options(options); auto flattened_options = flatten_add_event_listener_options(options);
@ -129,7 +129,7 @@ void EventTarget::add_event_listener(DeprecatedFlyString const& type, IDLEventLi
// once is once, and signal is signal. // once is once, and signal is signal.
auto event_listener = heap().allocate_without_realm<DOMEventListener>(); auto event_listener = heap().allocate_without_realm<DOMEventListener>();
event_listener->type = type; event_listener->type = type.to_deprecated_fly_string();
event_listener->callback = callback; event_listener->callback = callback;
event_listener->signal = move(flattened_options.signal); event_listener->signal = move(flattened_options.signal);
event_listener->capture = flattened_options.capture; event_listener->capture = flattened_options.capture;
@ -138,7 +138,7 @@ void EventTarget::add_event_listener(DeprecatedFlyString const& type, IDLEventLi
add_an_event_listener(*event_listener); add_an_event_listener(*event_listener);
} }
void EventTarget::add_event_listener_without_options(DeprecatedFlyString const& type, IDLEventListener& callback) void EventTarget::add_event_listener_without_options(FlyString const& type, IDLEventListener& callback)
{ {
add_event_listener(type, &callback, AddEventListenerOptions {}); add_event_listener(type, &callback, AddEventListenerOptions {});
} }
@ -179,7 +179,7 @@ void EventTarget::add_an_event_listener(DOMEventListener& listener)
} }
// https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener // https://dom.spec.whatwg.org/#dom-eventtarget-removeeventlistener
void EventTarget::remove_event_listener(DeprecatedFlyString const& type, IDLEventListener* callback, Variant<EventListenerOptions, bool> const& options) void EventTarget::remove_event_listener(FlyString const& type, IDLEventListener* callback, Variant<EventListenerOptions, bool> const& options)
{ {
// 1. Let capture be the result of flattening options. // 1. Let capture be the result of flattening options.
bool capture = flatten_event_listener_options(options); bool capture = flatten_event_listener_options(options);
@ -194,7 +194,7 @@ void EventTarget::remove_event_listener(DeprecatedFlyString const& type, IDLEven
return entry.callback->callback().callback == callback->callback().callback; return entry.callback->callback().callback == callback->callback().callback;
}; };
auto it = m_event_listener_list.find_if([&](auto& entry) { auto it = m_event_listener_list.find_if([&](auto& entry) {
return entry->type == type return entry->type == type.to_deprecated_fly_string()
&& callbacks_match(*entry) && callbacks_match(*entry)
&& entry->capture == capture; && entry->capture == capture;
}); });
@ -202,7 +202,7 @@ void EventTarget::remove_event_listener(DeprecatedFlyString const& type, IDLEven
remove_an_event_listener(**it); remove_an_event_listener(**it);
} }
void EventTarget::remove_event_listener_without_options(DeprecatedFlyString const& type, IDLEventListener& callback) void EventTarget::remove_event_listener_without_options(FlyString const& type, IDLEventListener& callback)
{ {
remove_event_listener(type, &callback, EventListenerOptions {}); remove_event_listener(type, &callback, EventListenerOptions {});
} }
@ -275,7 +275,7 @@ static bool is_window_event_handler(FlyString const& name)
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#determining-the-target-of-an-event-handler // https://html.spec.whatwg.org/multipage/webappapis.html#determining-the-target-of-an-event-handler
static EventTarget* determine_target_of_event_handler(EventTarget& event_target, DeprecatedFlyString const& name) static EventTarget* determine_target_of_event_handler(EventTarget& event_target, FlyString const& name)
{ {
// To determine the target of an event handler, given an EventTarget object eventTarget on which the event handler is exposed, // To determine the target of an event handler, given an EventTarget object eventTarget on which the event handler is exposed,
// and an event handler name name, the following steps are taken: // and an event handler name name, the following steps are taken:
@ -288,8 +288,7 @@ static EventTarget* determine_target_of_event_handler(EventTarget& event_target,
// 2. If name is not the name of an attribute member of the WindowEventHandlers interface mixin and the Window-reflecting // 2. If name is not the name of an attribute member of the WindowEventHandlers interface mixin and the Window-reflecting
// body element event handler set does not contain name, then return eventTarget. // body element event handler set does not contain name, then return eventTarget.
auto new_string_name = FlyString::from_deprecated_fly_string(name).release_value(); if (!is_window_event_handler(name) && !is_window_reflecting_body_element_event_handler(name))
if (!is_window_event_handler(new_string_name) && !is_window_reflecting_body_element_event_handler(new_string_name))
return &event_target; return &event_target;
// 3. If eventTarget's node document is not an active document, then return null. // 3. If eventTarget's node document is not an active document, then return null.
@ -303,21 +302,19 @@ static EventTarget* determine_target_of_event_handler(EventTarget& event_target,
// https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-attributes:event-handler-idl-attributes-2 // https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-attributes:event-handler-idl-attributes-2
WebIDL::CallbackType* EventTarget::event_handler_attribute(FlyString const& name) WebIDL::CallbackType* EventTarget::event_handler_attribute(FlyString const& name)
{ {
auto deprecated_name = name.to_deprecated_fly_string();
// 1. Let eventTarget be the result of determining the target of an event handler given this object and name. // 1. Let eventTarget be the result of determining the target of an event handler given this object and name.
auto target = determine_target_of_event_handler(*this, deprecated_name); auto target = determine_target_of_event_handler(*this, name);
// 2. If eventTarget is null, then return null. // 2. If eventTarget is null, then return null.
if (!target) if (!target)
return nullptr; return nullptr;
// 3. Return the result of getting the current value of the event handler given eventTarget and name. // 3. Return the result of getting the current value of the event handler given eventTarget and name.
return target->get_current_value_of_event_handler(deprecated_name); return target->get_current_value_of_event_handler(name);
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#getting-the-current-value-of-the-event-handler // https://html.spec.whatwg.org/multipage/webappapis.html#getting-the-current-value-of-the-event-handler
WebIDL::CallbackType* EventTarget::get_current_value_of_event_handler(DeprecatedFlyString const& name) WebIDL::CallbackType* EventTarget::get_current_value_of_event_handler(FlyString const& name)
{ {
// 1. Let handlerMap be eventTarget's event handler map. (NOTE: Not necessary) // 1. Let handlerMap be eventTarget's event handler map. (NOTE: Not necessary)
@ -379,7 +376,7 @@ WebIDL::CallbackType* EventTarget::get_current_value_of_event_handler(Deprecated
StringBuilder builder; StringBuilder builder;
// sourceText // sourceText
if (name == HTML::EventNames::error.to_deprecated_fly_string() && is<HTML::Window>(this)) { if (name == HTML::EventNames::error && is<HTML::Window>(this)) {
// -> If name is onerror and eventTarget is a Window object // -> If name is onerror and eventTarget is a Window object
// The string formed by concatenating "function ", name, "(event, source, lineno, colno, error) {", U+000A LF, body, U+000A LF, and "}". // The string formed by concatenating "function ", name, "(event, source, lineno, colno, error) {", U+000A LF, body, U+000A LF, and "}".
builder.appendff("function {}(event, source, lineno, colno, error) {{\n{}\n}}", name, body); builder.appendff("function {}(event, source, lineno, colno, error) {{\n{}\n}}", name, body);
@ -457,7 +454,7 @@ WebIDL::CallbackType* EventTarget::get_current_value_of_event_handler(Deprecated
// 6. Return scope. (NOTE: Not necessary) // 6. Return scope. (NOTE: Not necessary)
auto function = JS::ECMAScriptFunctionObject::create(realm, name, builder.to_deprecated_string(), program->body(), program->parameters(), program->function_length(), scope, nullptr, JS::FunctionKind::Normal, program->is_strict_mode(), program->might_need_arguments_object(), is_arrow_function); auto function = JS::ECMAScriptFunctionObject::create(realm, name.to_deprecated_fly_string(), builder.to_deprecated_string(), program->body(), program->parameters(), program->function_length(), scope, nullptr, JS::FunctionKind::Normal, program->is_strict_mode(), program->might_need_arguments_object(), is_arrow_function);
// 10. Remove settings object's realm execution context from the JavaScript execution context stack. // 10. Remove settings object's realm execution context from the JavaScript execution context stack.
VERIFY(vm.execution_context_stack().last() == &settings_object.realm_execution_context()); VERIFY(vm.execution_context_stack().last() == &settings_object.realm_execution_context());
@ -478,9 +475,8 @@ WebIDL::CallbackType* EventTarget::get_current_value_of_event_handler(Deprecated
// https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-attributes:event-handler-idl-attributes-3 // https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-attributes:event-handler-idl-attributes-3
void EventTarget::set_event_handler_attribute(FlyString const& name, WebIDL::CallbackType* value) void EventTarget::set_event_handler_attribute(FlyString const& name, WebIDL::CallbackType* value)
{ {
auto deprecated_name = name.to_deprecated_fly_string();
// 1. Let eventTarget be the result of determining the target of an event handler given this object and name. // 1. Let eventTarget be the result of determining the target of an event handler given this object and name.
auto event_target = determine_target_of_event_handler(*this, deprecated_name); auto event_target = determine_target_of_event_handler(*this, name);
// 2. If eventTarget is null, then return. // 2. If eventTarget is null, then return.
if (!event_target) if (!event_target)
@ -488,7 +484,7 @@ void EventTarget::set_event_handler_attribute(FlyString const& name, WebIDL::Cal
// 3. If the given value is null, then deactivate an event handler given eventTarget and name. // 3. If the given value is null, then deactivate an event handler given eventTarget and name.
if (!value) { if (!value) {
event_target->deactivate_event_handler(deprecated_name); event_target->deactivate_event_handler(name);
return; return;
} }
@ -497,7 +493,7 @@ void EventTarget::set_event_handler_attribute(FlyString const& name, WebIDL::Cal
auto& handler_map = event_target->m_event_handler_map; auto& handler_map = event_target->m_event_handler_map;
// 2. Let eventHandler be handlerMap[name]. // 2. Let eventHandler be handlerMap[name].
auto event_handler_iterator = handler_map.find(deprecated_name); auto event_handler_iterator = handler_map.find(name);
// 3. Set eventHandler's value to the given value. // 3. Set eventHandler's value to the given value.
if (event_handler_iterator == handler_map.end()) { if (event_handler_iterator == handler_map.end()) {
@ -508,9 +504,9 @@ void EventTarget::set_event_handler_attribute(FlyString const& name, WebIDL::Cal
// Optimization: We pass in the event handler here instead of having activate_event_handler do another hash map lookup just to get the same object. // Optimization: We pass in the event handler here instead of having activate_event_handler do another hash map lookup just to get the same object.
// This handles a new event handler while the other path handles an existing event handler. As such, both paths must have their own // This handles a new event handler while the other path handles an existing event handler. As such, both paths must have their own
// unique call to activate_event_handler. // unique call to activate_event_handler.
event_target->activate_event_handler(deprecated_name, *new_event_handler); event_target->activate_event_handler(name, *new_event_handler);
handler_map.set(deprecated_name, new_event_handler); handler_map.set(name, new_event_handler);
return; return;
} }
@ -520,11 +516,11 @@ void EventTarget::set_event_handler_attribute(FlyString const& name, WebIDL::Cal
// 4. Activate an event handler given eventTarget and name. // 4. Activate an event handler given eventTarget and name.
// NOTE: See the optimization comment above. // NOTE: See the optimization comment above.
event_target->activate_event_handler(deprecated_name, *event_handler); event_target->activate_event_handler(name, *event_handler);
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#activate-an-event-handler // https://html.spec.whatwg.org/multipage/webappapis.html#activate-an-event-handler
void EventTarget::activate_event_handler(DeprecatedFlyString const& name, HTML::EventHandler& event_handler) void EventTarget::activate_event_handler(FlyString const& name, HTML::EventHandler& event_handler)
{ {
// 1. Let handlerMap be eventTarget's event handler map. // 1. Let handlerMap be eventTarget's event handler map.
// 2. Let eventHandler be handlerMap[name]. // 2. Let eventHandler be handlerMap[name].
@ -564,7 +560,7 @@ void EventTarget::activate_event_handler(DeprecatedFlyString const& name, HTML::
// 5. Let listener be a new event listener whose type is the event handler event type corresponding to eventHandler and callback is callback. // 5. Let listener be a new event listener whose type is the event handler event type corresponding to eventHandler and callback is callback.
auto listener = realm.heap().allocate_without_realm<DOMEventListener>(); auto listener = realm.heap().allocate_without_realm<DOMEventListener>();
listener->type = name; listener->type = name.to_deprecated_fly_string();
listener->callback = IDLEventListener::create(realm, *callback).release_value_but_fixme_should_propagate_errors(); listener->callback = IDLEventListener::create(realm, *callback).release_value_but_fixme_should_propagate_errors();
// 6. Add an event listener with eventTarget and listener. // 6. Add an event listener with eventTarget and listener.
@ -574,7 +570,7 @@ void EventTarget::activate_event_handler(DeprecatedFlyString const& name, HTML::
event_handler.listener = listener; event_handler.listener = listener;
} }
void EventTarget::deactivate_event_handler(DeprecatedFlyString const& name) void EventTarget::deactivate_event_handler(FlyString const& name)
{ {
// 1. Let handlerMap be eventTarget's event handler map. (NOTE: Not necessary) // 1. Let handlerMap be eventTarget's event handler map. (NOTE: Not necessary)
@ -604,7 +600,7 @@ void EventTarget::deactivate_event_handler(DeprecatedFlyString const& name)
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#the-event-handler-processing-algorithm // https://html.spec.whatwg.org/multipage/webappapis.html#the-event-handler-processing-algorithm
JS::ThrowCompletionOr<void> EventTarget::process_event_handler_for_event(DeprecatedFlyString const& name, Event& event) JS::ThrowCompletionOr<void> EventTarget::process_event_handler_for_event(FlyString const& name, Event& event)
{ {
// 1. Let callback be the result of getting the current value of the event handler given eventTarget and name. // 1. Let callback be the result of getting the current value of the event handler given eventTarget and name.
auto* callback = get_current_value_of_event_handler(name); auto* callback = get_current_value_of_event_handler(name);
@ -683,23 +679,21 @@ JS::ThrowCompletionOr<void> EventTarget::process_event_handler_for_event(Depreca
} }
// https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-attributes:concept-element-attributes-change-ext // https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-attributes:concept-element-attributes-change-ext
void EventTarget::element_event_handler_attribute_changed(FlyString const& local_name, DeprecatedString const& value) void EventTarget::element_event_handler_attribute_changed(FlyString const& local_name, Optional<String> const& value)
{ {
// NOTE: Step 1 of this algorithm was handled in HTMLElement::parse_attribute. // NOTE: Step 1 of this algorithm was handled in HTMLElement::parse_attribute.
auto deprecated_local_name = local_name.to_deprecated_fly_string();
// 2. Let eventTarget be the result of determining the target of an event handler given element and localName. // 2. Let eventTarget be the result of determining the target of an event handler given element and localName.
// NOTE: element is `this`. // NOTE: element is `this`.
auto* event_target = determine_target_of_event_handler(*this, deprecated_local_name); auto* event_target = determine_target_of_event_handler(*this, local_name);
// 3. If eventTarget is null, then return. // 3. If eventTarget is null, then return.
if (!event_target) if (!event_target)
return; return;
// 4. If value is null, then deactivate an event handler given eventTarget and localName. // 4. If value is null, then deactivate an event handler given eventTarget and localName.
if (value.is_null()) { if (!value.has_value()) {
event_target->deactivate_event_handler(deprecated_local_name); event_target->deactivate_event_handler(local_name);
return; return;
} }
@ -710,7 +704,7 @@ void EventTarget::element_event_handler_attribute_changed(FlyString const& local
auto& handler_map = event_target->m_event_handler_map; auto& handler_map = event_target->m_event_handler_map;
// 3. Let eventHandler be handlerMap[localName]. // 3. Let eventHandler be handlerMap[localName].
auto event_handler_iterator = handler_map.find(deprecated_local_name); auto event_handler_iterator = handler_map.find(local_name);
// FIXME: 4. Let location be the script location that triggered the execution of these steps. // FIXME: 4. Let location be the script location that triggered the execution of these steps.
@ -720,20 +714,20 @@ void EventTarget::element_event_handler_attribute_changed(FlyString const& local
// NOTE: See the optimization comments in set_event_handler_attribute. // NOTE: See the optimization comments in set_event_handler_attribute.
if (event_handler_iterator == handler_map.end()) { if (event_handler_iterator == handler_map.end()) {
auto new_event_handler = heap().allocate_without_realm<HTML::EventHandler>(value); auto new_event_handler = heap().allocate_without_realm<HTML::EventHandler>(value->to_deprecated_string());
// 6. Activate an event handler given eventTarget and name. // 6. Activate an event handler given eventTarget and name.
event_target->activate_event_handler(deprecated_local_name, *new_event_handler); event_target->activate_event_handler(local_name, *new_event_handler);
handler_map.set(deprecated_local_name, new_event_handler); handler_map.set(local_name, new_event_handler);
return; return;
} }
auto& event_handler = event_handler_iterator->value; auto& event_handler = event_handler_iterator->value;
// 6. Activate an event handler given eventTarget and name. // 6. Activate an event handler given eventTarget and name.
event_handler->value = value; event_handler->value = value->to_deprecated_string();
event_target->activate_event_handler(deprecated_local_name, *event_handler); event_target->activate_event_handler(local_name, *event_handler);
} }
bool EventTarget::dispatch_event(Event& event) bool EventTarget::dispatch_event(Event& event)
@ -741,10 +735,10 @@ bool EventTarget::dispatch_event(Event& event)
return EventDispatcher::dispatch(*this, event); return EventDispatcher::dispatch(*this, event);
} }
bool EventTarget::has_event_listener(DeprecatedFlyString const& type) const bool EventTarget::has_event_listener(FlyString const& type) const
{ {
for (auto& listener : m_event_listener_list) { for (auto& listener : m_event_listener_list) {
if (listener->type == type) if (listener->type == type.to_deprecated_fly_string())
return true; return true;
} }
return false; return false;

22
Userland/Libraries/LibWeb/DOM/EventTarget.h
View file

@ -26,12 +26,12 @@ public:
virtual bool is_focusable() const { return false; } virtual bool is_focusable() const { return false; }
void add_event_listener(DeprecatedFlyString const& type, IDLEventListener* callback, Variant<AddEventListenerOptions, bool> const& options); void add_event_listener(FlyString const& type, IDLEventListener* callback, Variant<AddEventListenerOptions, bool> const& options);
void remove_event_listener(DeprecatedFlyString const& type, IDLEventListener* callback, Variant<EventListenerOptions, bool> const& options); void remove_event_listener(FlyString const& type, IDLEventListener* callback, Variant<EventListenerOptions, bool> const& options);
// NOTE: These are for internal use only. They operate as though addEventListener(type, callback) was called instead of addEventListener(type, callback, options). // NOTE: These are for internal use only. They operate as though addEventListener(type, callback) was called instead of addEventListener(type, callback, options).
void add_event_listener_without_options(DeprecatedFlyString const& type, IDLEventListener& callback); void add_event_listener_without_options(FlyString const& type, IDLEventListener& callback);
void remove_event_listener_without_options(DeprecatedFlyString const& type, IDLEventListener& callback); void remove_event_listener_without_options(FlyString const& type, IDLEventListener& callback);
virtual bool dispatch_event(Event&); virtual bool dispatch_event(Event&);
WebIDL::ExceptionOr<bool> dispatch_event_binding(Event&); WebIDL::ExceptionOr<bool> dispatch_event_binding(Event&);
@ -54,13 +54,13 @@ public:
WebIDL::CallbackType* event_handler_attribute(FlyString const& name); WebIDL::CallbackType* event_handler_attribute(FlyString const& name);
void set_event_handler_attribute(FlyString const& name, WebIDL::CallbackType*); void set_event_handler_attribute(FlyString const& name, WebIDL::CallbackType*);
bool has_event_listener(DeprecatedFlyString const& type) const; bool has_event_listener(FlyString const& type) const;
bool has_event_listeners() const; bool has_event_listeners() const;
protected: protected:
explicit EventTarget(JS::Realm&); explicit EventTarget(JS::Realm&);
void element_event_handler_attribute_changed(FlyString const& local_name, DeprecatedString const& value); void element_event_handler_attribute_changed(FlyString const& local_name, Optional<String> const& value);
virtual void visit_edges(Cell::Visitor&) override; virtual void visit_edges(Cell::Visitor&) override;
@ -69,12 +69,12 @@ private:
// https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-map // https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-map
// Spec Note: The order of the entries of event handler map could be arbitrary. It is not observable through any algorithms that operate on the map. // Spec Note: The order of the entries of event handler map could be arbitrary. It is not observable through any algorithms that operate on the map.
HashMap<DeprecatedFlyString, JS::GCPtr<HTML::EventHandler>> m_event_handler_map; HashMap<FlyString, JS::GCPtr<HTML::EventHandler>> m_event_handler_map;
WebIDL::CallbackType* get_current_value_of_event_handler(DeprecatedFlyString const& name); WebIDL::CallbackType* get_current_value_of_event_handler(FlyString const& name);
void activate_event_handler(DeprecatedFlyString const& name, HTML::EventHandler& event_handler); void activate_event_handler(FlyString const& name, HTML::EventHandler& event_handler);
void deactivate_event_handler(DeprecatedFlyString const& name); void deactivate_event_handler(FlyString const& name);
JS::ThrowCompletionOr<void> process_event_handler_for_event(DeprecatedFlyString const& name, Event& event); JS::ThrowCompletionOr<void> process_event_handler_for_event(FlyString const& name, Event& event);
}; };
bool is_window_reflecting_body_element_event_handler(FlyString const& name); bool is_window_reflecting_body_element_event_handler(FlyString const& name);

2
Userland/Libraries/LibWeb/DOM/EventTarget.idl
View file

@ -1,7 +1,7 @@
#import <DOM/AbortSignal.idl> #import <DOM/AbortSignal.idl>
// https://dom.spec.whatwg.org/#eventtarget // https://dom.spec.whatwg.org/#eventtarget
[Exposed=*] [Exposed=*, UseNewAKString]
interface EventTarget { interface EventTarget {
undefined addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = {}); undefined addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options = {});

6
Userland/Libraries/LibWeb/HTML/HTMLBodyElement.cpp
View file

@ -71,9 +71,9 @@ void HTMLBodyElement::parse_attribute(DeprecatedFlyString const& name, Deprecate
} }
#undef __ENUMERATE #undef __ENUMERATE
#define __ENUMERATE(attribute_name, event_name) \ #define __ENUMERATE(attribute_name, event_name) \
if (name == HTML::AttributeNames::attribute_name) { \ if (name == HTML::AttributeNames::attribute_name) { \
element_event_handler_attribute_changed(event_name, value); \ element_event_handler_attribute_changed(event_name, String::from_deprecated_string(value).release_value()); \
} }
ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE)
#undef __ENUMERATE #undef __ENUMERATE

6
Userland/Libraries/LibWeb/HTML/HTMLElement.cpp
View file

@ -245,9 +245,9 @@ void HTMLElement::parse_attribute(DeprecatedFlyString const& name, DeprecatedStr
// 1. If namespace is not null, or localName is not the name of an event handler content attribute on element, then return. // 1. If namespace is not null, or localName is not the name of an event handler content attribute on element, then return.
// FIXME: Add the namespace part once we support attribute namespaces. // FIXME: Add the namespace part once we support attribute namespaces.
#undef __ENUMERATE #undef __ENUMERATE
#define __ENUMERATE(attribute_name, event_name) \ #define __ENUMERATE(attribute_name, event_name) \
if (name == HTML::AttributeNames::attribute_name) { \ if (name == HTML::AttributeNames::attribute_name) { \
element_event_handler_attribute_changed(event_name, value); \ element_event_handler_attribute_changed(event_name, String::from_deprecated_string(value).release_value()); \
} }
ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_GLOBAL_EVENT_HANDLERS(__ENUMERATE)
#undef __ENUMERATE #undef __ENUMERATE

6
Userland/Libraries/LibWeb/HTML/HTMLFrameSetElement.cpp
View file

@ -30,9 +30,9 @@ void HTMLFrameSetElement::parse_attribute(DeprecatedFlyString const& name, Depre
HTMLElement::parse_attribute(name, value); HTMLElement::parse_attribute(name, value);
#undef __ENUMERATE #undef __ENUMERATE
#define __ENUMERATE(attribute_name, event_name) \ #define __ENUMERATE(attribute_name, event_name) \
if (name == HTML::AttributeNames::attribute_name) { \ if (name == HTML::AttributeNames::attribute_name) { \
element_event_handler_attribute_changed(event_name, value); \ element_event_handler_attribute_changed(event_name, String::from_deprecated_string(value).release_value()); \
} }
ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE) ENUMERATE_WINDOW_EVENT_HANDLERS(__ENUMERATE)
#undef __ENUMERATE #undef __ENUMERATE

14
Userland/Libraries/LibWeb/XHR/XMLHttpRequest.cpp
View file

@ -983,19 +983,19 @@ bool XMLHttpRequest::must_survive_garbage_collection() const
if ((m_state == State::Opened && m_send) if ((m_state == State::Opened && m_send)
|| m_state == State::HeadersReceived || m_state == State::HeadersReceived
|| m_state == State::Loading) { || m_state == State::Loading) {
if (has_event_listener(EventNames::readystatechange.to_deprecated_fly_string())) if (has_event_listener(EventNames::readystatechange))
return true; return true;
if (has_event_listener(EventNames::progress.to_deprecated_fly_string())) if (has_event_listener(EventNames::progress))
return true; return true;
if (has_event_listener(EventNames::abort.to_deprecated_fly_string())) if (has_event_listener(EventNames::abort))
return true; return true;
if (has_event_listener(EventNames::error.to_deprecated_fly_string())) if (has_event_listener(EventNames::error))
return true; return true;
if (has_event_listener(EventNames::load.to_deprecated_fly_string())) if (has_event_listener(EventNames::load))
return true; return true;
if (has_event_listener(EventNames::timeout.to_deprecated_fly_string())) if (has_event_listener(EventNames::timeout))
return true; return true;
if (has_event_listener(EventNames::loadend.to_deprecated_fly_string())) if (has_event_listener(EventNames::loadend))
return true; return true;
} }