LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 01:37:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Use HTML::EventNames::animation* instead of string literals

Browse Source
This commit is contained in:
Andreas Kling 2024-03-16 11:17:16 +01:00
parent 43c720db81
commit 98cf845d8a
Notes: sideshowbarker 2024-07-17 16:23:06 +09:00 
Author: https://github.com/awesomekling
Commit: https://github.com/SerenityOS/serenity/commit/98cf845d8a
Pull-request: https://github.com/SerenityOS/serenity/pull/23606
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Userland/Libraries/LibWeb/DOM/Document.cpp
View File

@ -1941,7 +1941,7 @@ void Document::dispatch_events_for_animation_if_necessary(JS::NonnullGCPtr<Anima
if (previous_phase != current_phase) {
auto owning_element = css_animation.owning_element();
auto dispatch_event = [&](FlyString name, double elapsed_time) {
auto dispatch_event = [&](FlyString const& name, double elapsed_time) {
append_pending_animation_event({
.event = CSS::AnimationEvent::create(
owning_element->realm(),
@ -1969,15 +1969,15 @@ void Document::dispatch_events_for_animation_if_necessary(JS::NonnullGCPtr<Anima
[[fallthrough]];
case Animations::AnimationEffect::Phase::Idle:
if (current_phase == Animations::AnimationEffect::Phase::Active) {
dispatch_event("animationstart"_fly_string, interval_start);
dispatch_event(HTML::EventNames::animationstart, interval_start);
} else if (current_phase == Animations::AnimationEffect::Phase::After) {
dispatch_event("animationstart"_fly_string, interval_start);
dispatch_event("animationend"_fly_string, interval_end);
dispatch_event(HTML::EventNames::animationstart, interval_start);
dispatch_event(HTML::EventNames::animationend, interval_end);
}
break;
case Animations::AnimationEffect::Phase::Active:
if (current_phase == Animations::AnimationEffect::Phase::Before) {
dispatch_event("animationend"_fly_string, interval_start);
dispatch_event(HTML::EventNames::animationend, interval_start);
} else if (current_phase == Animations::AnimationEffect::Phase::Active) {
auto previous_current_iteration = effect->previous_current_iteration();
if (previous_current_iteration != current_iteration) {
@ -1994,25 +1994,25 @@ void Document::dispatch_events_for_animation_if_necessary(JS::NonnullGCPtr<Anima
auto iteration_duration = iteration_duration_variant.has<String>() ? 0.0 : iteration_duration_variant.get<double>();
auto elapsed_time = (iteration_boundary - effect->iteration_start()) * iteration_duration;
dispatch_event("animationiteration"_fly_string, elapsed_time);
dispatch_event(HTML::EventNames::animationiteration, elapsed_time);
}
} else if (current_phase == Animations::AnimationEffect::Phase::After) {
dispatch_event("animationend"_fly_string, interval_end);
dispatch_event(HTML::EventNames::animationend, interval_end);
}
break;
case Animations::AnimationEffect::Phase::After:
if (current_phase == Animations::AnimationEffect::Phase::Active) {
dispatch_event("animationstart"_fly_string, interval_end);
dispatch_event(HTML::EventNames::animationstart, interval_end);
} else if (current_phase == Animations::AnimationEffect::Phase::Before) {
dispatch_event("animationstart"_fly_string, interval_end);
dispatch_event("animationend"_fly_string, interval_start);
dispatch_event(HTML::EventNames::animationstart, interval_end);
dispatch_event(HTML::EventNames::animationend, interval_start);
}
break;
}
if (current_phase == Animations::AnimationEffect::Phase::Idle && previous_phase != Animations::AnimationEffect::Phase::Idle && previous_phase != Animations::AnimationEffect::Phase::After) {
// FIXME: Use the active time "at the moment it was cancelled"
dispatch_event("animationcancel"_fly_string, effect->active_time_using_fill(Bindings::FillMode::Both).value());
dispatch_event(HTML::EventNames::animationcancel, effect->active_time_using_fill(Bindings::FillMode::Both).value());
}
}
}

1
Userland/Libraries/LibWeb/HTML/EventNames.h
View File

@ -17,6 +17,7 @@ namespace Web::HTML::EventNames {
#define ENUMERATE_HTML_EVENTS \
__ENUMERATE_HTML_EVENT(abort) \
__ENUMERATE_HTML_EVENT(addtrack) \
__ENUMERATE_HTML_EVENT(animationcancel) \
__ENUMERATE_HTML_EVENT(animationend) \
__ENUMERATE_HTML_EVENT(animationiteration) \
__ENUMERATE_HTML_EVENT(animationstart) \