diff options
author | Kenneth Myhra <kennethmyhra@gmail.com> | 2023-04-06 16:12:33 +0200 |
---|---|---|
committer | Linus Groh <mail@linusgroh.de> | 2023-04-07 22:41:01 +0200 |
commit | ad5cbdc51bd1673bedf544b4e6332896a7706171 (patch) | |
tree | cb3e0d647508e4607a858b2426ca97e2a8a2b02f /Userland/Libraries/LibWeb/DOM/Document.cpp | |
parent | e0002aa9939c71deb32dc0065cba9e129e389ad5 (diff) | |
download | serenity-ad5cbdc51bd1673bedf544b4e6332896a7706171.zip |
LibWeb: Port {Mouse,UI,Wheel,}Event to new String
This ports MouseEvent, UIEvent, WheelEvent, and Event to new String.
They all had a dependency to T::create() in
WebDriverConnection::fire_an_event() and therefore had to be ported in
the same commit.
Diffstat (limited to 'Userland/Libraries/LibWeb/DOM/Document.cpp')
-rw-r--r-- | Userland/Libraries/LibWeb/DOM/Document.cpp | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Userland/Libraries/LibWeb/DOM/Document.cpp b/Userland/Libraries/LibWeb/DOM/Document.cpp index 4408440f6b..d5061840f2 100644 --- a/Userland/Libraries/LibWeb/DOM/Document.cpp +++ b/Userland/Libraries/LibWeb/DOM/Document.cpp @@ -1010,7 +1010,7 @@ void Document::set_hovered_node(Node* node) // FIXME: Check if we need to dispatch these events in a specific order. for (auto target = old_hovered_node; target && target.ptr() != common_ancestor; target = target->parent()) { // FIXME: Populate the event with mouse coordinates, etc. - target->dispatch_event(UIEvents::MouseEvent::create(realm(), UIEvents::EventNames::mouseleave.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors()); + target->dispatch_event(UIEvents::MouseEvent::create(realm(), UIEvents::EventNames::mouseleave).release_value_but_fixme_should_propagate_errors()); } } @@ -1019,7 +1019,7 @@ void Document::set_hovered_node(Node* node) // FIXME: Check if we need to dispatch these events in a specific order. for (auto target = m_hovered_node; target && target.ptr() != common_ancestor; target = target->parent()) { // FIXME: Populate the event with mouse coordinates, etc. - target->dispatch_event(UIEvents::MouseEvent::create(realm(), UIEvents::EventNames::mouseenter.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors()); + target->dispatch_event(UIEvents::MouseEvent::create(realm(), UIEvents::EventNames::mouseenter).release_value_but_fixme_should_propagate_errors()); } } } @@ -1292,44 +1292,44 @@ WebIDL::ExceptionOr<JS::NonnullGCPtr<Event>> Document::create_event(DeprecatedSt // 2. If interface is an ASCII case-insensitive match for any of the strings in the first column in the following table, // then set constructor to the interface in the second column on the same row as the matching string: if (Infra::is_ascii_case_insensitive_match(interface, "beforeunloadevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create BeforeUnloadEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create BeforeUnloadEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "compositionevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create CompositionEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create CompositionEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "customevent"sv)) { event = TRY(CustomEvent::create(realm, FlyString {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "devicemotionevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create DeviceMotionEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create DeviceMotionEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "deviceorientationevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create DeviceOrientationEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create DeviceOrientationEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "dragevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create DragEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create DragEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "event"sv) || Infra::is_ascii_case_insensitive_match(interface, "events"sv)) { - event = TRY(Event::create(realm, "")); + event = TRY(Event::create(realm, FlyString {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "focusevent"sv)) { - event = TRY(UIEvents::FocusEvent::create(realm, "")); + event = TRY(UIEvents::FocusEvent::create(realm, FlyString {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "hashchangeevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create HashChangeEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create HashChangeEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "htmlevents"sv)) { - event = TRY(Event::create(realm, "")); + event = TRY(Event::create(realm, FlyString {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "keyboardevent"sv)) { event = TRY(UIEvents::KeyboardEvent::create(realm, String {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "messageevent"sv)) { event = TRY(HTML::MessageEvent::create(realm, String {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "mouseevent"sv) || Infra::is_ascii_case_insensitive_match(interface, "mouseevents"sv)) { - event = TRY(UIEvents::MouseEvent::create(realm, "")); + event = TRY(UIEvents::MouseEvent::create(realm, FlyString {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "storageevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create StorageEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create StorageEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "svgevents"sv)) { - event = TRY(Event::create(realm, "")); + event = TRY(Event::create(realm, FlyString {})); } else if (Infra::is_ascii_case_insensitive_match(interface, "textevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create CompositionEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create CompositionEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "touchevent"sv)) { - event = TRY(Event::create(realm, "")); // FIXME: Create TouchEvent + event = TRY(Event::create(realm, FlyString {})); // FIXME: Create TouchEvent } else if (Infra::is_ascii_case_insensitive_match(interface, "uievent"sv) || Infra::is_ascii_case_insensitive_match(interface, "uievents"sv)) { - event = TRY(UIEvents::UIEvent::create(realm, "")); + event = TRY(UIEvents::UIEvent::create(realm, FlyString {})); } // 3. If constructor is null, then throw a "NotSupportedError" DOMException. @@ -1589,7 +1589,7 @@ void Document::update_readiness(HTML::DocumentReadyState readiness_value) } // 4. Fire an event named readystatechange at document. - dispatch_event(Event::create(realm(), HTML::EventNames::readystatechange.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors()); + dispatch_event(Event::create(realm(), HTML::EventNames::readystatechange).release_value_but_fixme_should_propagate_errors()); } Page* Document::page() @@ -1604,7 +1604,7 @@ Page const* Document::page() const EventTarget* Document::get_parent(Event const& event) { - if (event.type() == HTML::EventNames::load.to_deprecated_fly_string()) + if (event.type() == HTML::EventNames::load) return nullptr; return m_window; @@ -1637,7 +1637,7 @@ void Document::completely_finish_loading() // 5. Otherwise, if container is non-null, then queue an element task on the DOM manipulation task source given container to fire an event named load at container. else if (container) { container->queue_an_element_task(HTML::Task::Source::DOMManipulation, [container] { - container->dispatch_event(DOM::Event::create(container->realm(), HTML::EventNames::load.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors()); + container->dispatch_event(DOM::Event::create(container->realm(), HTML::EventNames::load).release_value_but_fixme_should_propagate_errors()); }); } } @@ -1767,7 +1767,7 @@ void Document::update_the_visibility_state(HTML::VisibilityState visibility_stat // FIXME: 3. Run any page visibility change steps which may be defined in other specifications, with visibility state and document. // 4. Fire an event named visibilitychange at document, with its bubbles attribute initialized to true. - auto event = DOM::Event::create(realm(), HTML::EventNames::visibilitychange.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors(); + auto event = DOM::Event::create(realm(), HTML::EventNames::visibilitychange).release_value_but_fixme_should_propagate_errors(); event->set_bubbles(true); dispatch_event(event); } @@ -1788,7 +1788,7 @@ void Document::run_the_resize_steps() return; m_last_viewport_size = viewport_size; - window().dispatch_event(DOM::Event::create(realm(), UIEvents::EventNames::resize.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors()); + window().dispatch_event(DOM::Event::create(realm(), UIEvents::EventNames::resize).release_value_but_fixme_should_propagate_errors()); schedule_layout_update(); } @@ -1800,14 +1800,14 @@ void Document::run_the_scroll_steps() for (auto& target : m_pending_scroll_event_targets) { // 1. If target is a Document, fire an event named scroll that bubbles at target and fire an event named scroll at the VisualViewport that is associated with target. if (is<Document>(*target)) { - auto event = DOM::Event::create(realm(), HTML::EventNames::scroll.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors(); + auto event = DOM::Event::create(realm(), HTML::EventNames::scroll).release_value_but_fixme_should_propagate_errors(); event->set_bubbles(true); target->dispatch_event(event); // FIXME: Fire at the associated VisualViewport } // 2. Otherwise, fire an event named scroll at target. else { - auto event = DOM::Event::create(realm(), HTML::EventNames::scroll.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors(); + auto event = DOM::Event::create(realm(), HTML::EventNames::scroll).release_value_but_fixme_should_propagate_errors(); target->dispatch_event(event); } } @@ -1847,7 +1847,7 @@ void Document::evaluate_media_queries_and_report_changes() CSS::MediaQueryListEventInit init; init.media = String::from_deprecated_string(media_query_list->media()).release_value_but_fixme_should_propagate_errors(); init.matches = now_matches; - auto event = CSS::MediaQueryListEvent::create(realm(), HTML::EventNames::change.to_deprecated_fly_string(), init).release_value_but_fixme_should_propagate_errors(); + auto event = CSS::MediaQueryListEvent::create(realm(), HTML::EventNames::change, init).release_value_but_fixme_should_propagate_errors(); event->set_is_trusted(true); media_query_list->dispatch_event(*event); } @@ -2347,7 +2347,7 @@ void Document::unload(bool recursive_flag, Optional<DocumentUnloadTimingInfo> un // then fire an event named unload at document's relevant global object, with legacy target override flag set. // FIXME: The legacy target override flag is currently set by a virtual override of dispatch_event() // We should reorganize this so that the flag appears explicitly here instead. - auto event = DOM::Event::create(realm(), HTML::EventNames::unload.to_deprecated_fly_string()).release_value_but_fixme_should_propagate_errors(); + auto event = DOM::Event::create(realm(), HTML::EventNames::unload).release_value_but_fixme_should_propagate_errors(); global_object().dispatch_event(event); } |