diff --git a/Libraries/LibWeb/DOM/Event.h b/Libraries/LibWeb/DOM/Event.h index ca2ca845dba..329da9813ee 100644 --- a/Libraries/LibWeb/DOM/Event.h +++ b/Libraries/LibWeb/DOM/Event.h @@ -1,7 +1,6 @@ #pragma once -#include -#include +#include #include namespace Web { @@ -12,25 +11,25 @@ class Event public: using WrapperType = Bindings::EventWrapper; - static NonnullRefPtr create(String event_name) + static NonnullRefPtr create(const FlyString& event_name) { - return adopt(*new Event(move(event_name))); + return adopt(*new Event(event_name)); } virtual ~Event() {} - const String& name() const { return m_event_name; } + const FlyString& name() const { return m_event_name; } virtual bool is_mouse_event() const { return false; } protected: - Event(String event_name) - : m_event_name(move(event_name)) + Event(const FlyString& event_name) + : m_event_name(event_name) { } private: - String m_event_name; + FlyString m_event_name; }; } diff --git a/Libraries/LibWeb/DOM/EventTarget.cpp b/Libraries/LibWeb/DOM/EventTarget.cpp index 5d656c74af1..1af0b18458b 100644 --- a/Libraries/LibWeb/DOM/EventTarget.cpp +++ b/Libraries/LibWeb/DOM/EventTarget.cpp @@ -37,9 +37,9 @@ EventTarget::~EventTarget() { } -void EventTarget::add_event_listener(String event_name, NonnullRefPtr listener) +void EventTarget::add_event_listener(const FlyString& event_name, NonnullRefPtr listener) { - m_listeners.append({ move(event_name), move(listener) }); + m_listeners.append({ event_name, move(listener) }); } } diff --git a/Libraries/LibWeb/DOM/EventTarget.h b/Libraries/LibWeb/DOM/EventTarget.h index d23ebca60d1..b322336b57c 100644 --- a/Libraries/LibWeb/DOM/EventTarget.h +++ b/Libraries/LibWeb/DOM/EventTarget.h @@ -26,8 +26,8 @@ #pragma once +#include #include -#include #include #include @@ -43,12 +43,12 @@ public: void ref() { ref_event_target(); } void unref() { unref_event_target(); } - void add_event_listener(String event_name, NonnullRefPtr); + void add_event_listener(const FlyString& event_name, NonnullRefPtr); virtual void dispatch_event(NonnullRefPtr) = 0; struct EventListenerRegistration { - String event_name; + FlyString event_name; NonnullRefPtr listener; }; diff --git a/Libraries/LibWeb/DOM/MouseEvent.h b/Libraries/LibWeb/DOM/MouseEvent.h index 5b9c39f44d9..e77db8da1b7 100644 --- a/Libraries/LibWeb/DOM/MouseEvent.h +++ b/Libraries/LibWeb/DOM/MouseEvent.h @@ -8,9 +8,9 @@ class MouseEvent final : public Event { public: using WrapperType = Bindings::MouseEventWrapper; - static NonnullRefPtr create(String event_name, i32 offset_x, i32 offset_y) + static NonnullRefPtr create(const FlyString& event_name, i32 offset_x, i32 offset_y) { - return adopt(*new MouseEvent(move(event_name), offset_x, offset_y)); + return adopt(*new MouseEvent(event_name, offset_x, offset_y)); } virtual ~MouseEvent() override {} @@ -19,8 +19,8 @@ public: i32 offset_y() const { return m_offset_y; } protected: - MouseEvent(String event_name, i32 offset_x, i32 offset_y) - : Event(move(event_name)) + MouseEvent(const FlyString& event_name, i32 offset_x, i32 offset_y) + : Event(event_name) , m_offset_x(offset_x) , m_offset_y(offset_y) {