RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 15:38:10 +00:00
Code Issues Activity Actions

LibWeb: Fix broken step 4.3 implementation in run_focus_update_steps()

Browse source 
Some over-eager copy-pasting led to incorrect code for the new chain.
This commit is contained in:
Andreas Kling 2022-02-07 02:10:03 +01:00
parent a05c07fdcd
commit 89cd00b540
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -217,9 +217,11 @@ static void run_focus_update_steps(NonnullRefPtrVector<DOM::Node> old_chain, Non
// then let related blur target be the last entry in new chain.
// Otherwise, let related blur target be null.
RefPtr<DOM::EventTarget> related_blur_target;
if (&entry == &old_chain.last()
if (!old_chain.is_empty()
&& &entry == &old_chain.last()
&& is<DOM::Element>(entry)
&& (!new_chain.is_empty() && is<DOM::Element>(new_chain.last()))) {
&& !new_chain.is_empty()
&& is<DOM::Element>(new_chain.last())) {
related_blur_target = new_chain.last();
}
@ -255,15 +257,17 @@ static void run_focus_update_steps(NonnullRefPtrVector<DOM::Node> old_chain, Non
focus_event_target = static_cast<DOM::Document&>(entry).window();
}
// 3. If entry is the last entry in old chain, and entry is an Element,
// and the last entry in new chain is also an Element,
// then let related focus target be the last entry in new chain.
// 3. If entry is the last entry in new chain, and entry is an Element,
// and the last entry in old chain is also an Element,
// then let related focus target be the last entry in old chain.
// Otherwise, let related focus target be null.
RefPtr<DOM::EventTarget> related_focus_target;
if (&entry == &old_chain.last()
if (!new_chain.is_empty()
&& &entry == &new_chain.last()
&& is<DOM::Element>(entry)
&& (!new_chain.is_empty() && is<DOM::Element>(new_chain.last()))) {
related_focus_target = new_chain.last();
&& !old_chain.is_empty()
&& is<DOM::Element>(old_chain.last())) {
related_focus_target = old_chain.last();
}
// 4. If focus event target is not null, fire a focus event named focus at focus event target,