e76e8e22b5
I can't imagine how this happened, but it seems we've managed to
conflate the "event listener" and "EventListener" concepts from the DOM
specification in some parts of the code.
We previously had two things:
- DOM::EventListener
- DOM::EventTarget::EventListenerRegistration
DOM::EventListener was roughly the "EventListener" IDL type,
and DOM::EventTarget::EventListenerRegistration was roughly the "event
listener" concept. However, they were used interchangeably (and
incorrectly!) in many places.
After this patch, we now have:
- DOM::IDLEventListener
- DOM::DOMEventListener
DOM::IDLEventListener is the "EventListener" IDL type,
and DOM::DOMEventListener is the "event listener" concept.
This patch also updates the addEventListener() and removeEventListener()
functions to follow the spec more closely, along with the "inner invoke"
function in our EventDispatcher.
40 lines
1.2 KiB
C++
40 lines
1.2 KiB
C++
/*
|
|
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <AK/String.h>
|
|
#include <AK/Variant.h>
|
|
#include <LibJS/Heap/Handle.h>
|
|
#include <LibJS/Runtime/FunctionObject.h>
|
|
#include <LibWeb/Bindings/CallbackType.h>
|
|
#include <LibWeb/DOM/DOMEventListener.h>
|
|
|
|
namespace Web::HTML {
|
|
|
|
struct EventHandler {
|
|
EventHandler(String s)
|
|
: value(move(s))
|
|
{
|
|
}
|
|
|
|
EventHandler(Bindings::CallbackType c)
|
|
: value(move(c))
|
|
{
|
|
}
|
|
|
|
// Either uncompiled source code or a callback.
|
|
// https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-value
|
|
// NOTE: This does not contain Empty as part of the optimization of not allocating all event handler attributes up front.
|
|
// FIXME: The string should actually be an "internal raw uncompiled handler" struct. This struct is just the uncompiled source code plus a source location for reporting parse errors.
|
|
// https://html.spec.whatwg.org/multipage/webappapis.html#internal-raw-uncompiled-handler
|
|
Variant<String, Bindings::CallbackType> value;
|
|
|
|
// https://html.spec.whatwg.org/multipage/webappapis.html#event-handler-listener
|
|
RefPtr<DOM::DOMEventListener> listener;
|
|
};
|
|
|
|
}
|