RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 20:27:45 +00:00
Code Issues Activity Actions

LibWeb: Use NonnullRefPtrVector<DOM::Node> for focus chains

Browse source 
Let's just use reference-counting pointers for this, even if it seems
safe not to.
This commit is contained in:
Andreas Kling 2022-02-07 02:09:17 +01:00
parent 1ea2467a7a
commit a05c07fdcd
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,15 +182,15 @@ void HTMLElement::parse_attribute(const FlyString& name, const String& value)
} }
// https://html.spec.whatwg.org/multipage/interaction.html#focus-update-steps // https://html.spec.whatwg.org/multipage/interaction.html#focus-update-steps
static void run_focus_update_steps(Vector<DOM::Node&> old_chain, Vector<DOM::Node&> new_chain, DOM::Node& new_focus_target) static void run_focus_update_steps(NonnullRefPtrVector<DOM::Node> old_chain, NonnullRefPtrVector<DOM::Node> new_chain, DOM::Node& new_focus_target)
{ {
// 1. If the last entry in old chain and the last entry in new chain are the same, // 1. If the last entry in old chain and the last entry in new chain are the same,
// pop the last entry from old chain and the last entry from new chain and redo this step. // pop the last entry from old chain and the last entry from new chain and redo this step.
while (!old_chain.is_empty() while (!old_chain.is_empty()
&& !new_chain.is_empty() && !new_chain.is_empty()
&& &old_chain.last() == &new_chain.last()) { && &old_chain.last() == &new_chain.last()) {
old_chain.take_last(); (void)old_chain.take_last();
new_chain.take_last(); (void)new_chain.take_last();
} }
// 2. For each entry entry in old chain, in order, run these substeps: // 2. For each entry entry in old chain, in order, run these substeps:
@ -277,14 +277,14 @@ static void run_focus_update_steps(Vector<DOM::Node&> old_chain, Vector<DOM::Nod
} }
} }
// https://html.spec.whatwg.org/multipage/interaction.html#focus-chain // https://html.spec.whatwg.org/multipage/interaction.html#focus-chain
static Vector<DOM::Node&> focus_chain(DOM::Node* subject) static NonnullRefPtrVector<DOM::Node> focus_chain(DOM::Node* subject)
{ {
// FIXME: Move this somewhere more spec-friendly. // FIXME: Move this somewhere more spec-friendly.
if (!subject) if (!subject)
return {}; return {};
// 1. Let output be an empty list. // 1. Let output be an empty list.
Vector<DOM::Node&> output; NonnullRefPtrVector<DOM::Node> output;
// 2. Let currentObject be subject. // 2. Let currentObject be subject.
auto* current_object = subject; auto* current_object = subject;