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

LibWeb: Check if layout node is still present after dispatch_event

Browse source 
Fixes https://github.com/SerenityOS/serenity/issues/2638

Dispatching an event can change the document. Therefore another check
for the layout_root needs to be done.
This commit is contained in:
Kevin Meyer 2020-07-10 23:43:25 +02:00 • committed by Andreas Kling
parent 821043d798
commit 7b5ffe67cf
1 changed files with 13 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Libraries/LibWeb/Frame/EventHandler.cpp
View file

@ -72,13 +72,11 @@ LayoutDocument* EventHandler::layout_root()
bool EventHandler::handle_mouseup(const Gfx::IntPoint& position, unsigned button, unsigned modifiers) bool EventHandler::handle_mouseup(const Gfx::IntPoint& position, unsigned button, unsigned modifiers)
{ {
auto* layout_root_ptr = this->layout_root(); if (!layout_root())
if (!layout_root_ptr)
return false; return false;
auto& layout_root = *layout_root_ptr;
bool handled_event = false; bool handled_event = false;
auto result = layout_root.hit_test(position); auto result = layout_root()->hit_test(position);
if (result.layout_node && result.layout_node->node()) { if (result.layout_node && result.layout_node->node()) {
RefPtr<Node> node = result.layout_node->node(); RefPtr<Node> node = result.layout_node->node();
if (is<HTMLIFrameElement>(*node)) { if (is<HTMLIFrameElement>(*node)) {
@ -100,14 +98,12 @@ bool EventHandler::handle_mouseup(const Gfx::IntPoint& position, unsigned button
bool EventHandler::handle_mousedown(const Gfx::IntPoint& position, unsigned button, unsigned modifiers) bool EventHandler::handle_mousedown(const Gfx::IntPoint& position, unsigned button, unsigned modifiers)
{ {
auto* layout_root_ptr = this->layout_root(); if (!layout_root())
if (!layout_root_ptr)
return false; return false;
auto& layout_root = *layout_root_ptr;
NonnullRefPtr document = *m_frame.document(); NonnullRefPtr document = *m_frame.document();
auto& page_client = m_frame.page().client(); auto& page_client = m_frame.page().client();
auto result = layout_root.hit_test(position); auto result = layout_root()->hit_test(position);
if (!result.layout_node) if (!result.layout_node)
return false; return false;
@ -124,6 +120,9 @@ bool EventHandler::handle_mousedown(const Gfx::IntPoint& position, unsigned butt
auto offset = compute_mouse_event_offset(position, *result.layout_node); auto offset = compute_mouse_event_offset(position, *result.layout_node);
node->dispatch_event(MouseEvent::create("mousedown", offset.x(), offset.y())); node->dispatch_event(MouseEvent::create("mousedown", offset.x(), offset.y()));
if (!layout_root())
return true;
if (RefPtr<HTMLAnchorElement> link = node->enclosing_link_element()) { if (RefPtr<HTMLAnchorElement> link = node->enclosing_link_element()) {
auto href = link->href(); auto href = link->href();
auto url = document->complete_url(href); auto url = document->complete_url(href);
@ -151,7 +150,7 @@ bool EventHandler::handle_mousedown(const Gfx::IntPoint& position, unsigned butt
} }
} else { } else {
if (button == GUI::MouseButton::Left) { if (button == GUI::MouseButton::Left) {
layout_root.selection().set({ result.layout_node, result.index_in_node }, {}); layout_root()->selection().set({ result.layout_node, result.index_in_node }, {});
dump_selection("MouseDown"); dump_selection("MouseDown");
m_in_mouse_selection = true; m_in_mouse_selection = true;
} }
@ -164,16 +163,14 @@ bool EventHandler::handle_mousedown(const Gfx::IntPoint& position, unsigned butt
bool EventHandler::handle_mousemove(const Gfx::IntPoint& position, unsigned buttons, unsigned modifiers) bool EventHandler::handle_mousemove(const Gfx::IntPoint& position, unsigned buttons, unsigned modifiers)
{ {
auto* layout_root_ptr = this->layout_root(); if (!layout_root())
if (!layout_root_ptr)
return false; return false;
auto& layout_root = *layout_root_ptr;
auto& document = *m_frame.document(); auto& document = *m_frame.document();
auto& page_client = m_frame.page().client(); auto& page_client = m_frame.page().client();
bool hovered_node_changed = false; bool hovered_node_changed = false;
bool is_hovering_link = false; bool is_hovering_link = false;
auto result = layout_root.hit_test(position); auto result = layout_root()->hit_test(position);
const HTMLAnchorElement* hovered_link_element = nullptr; const HTMLAnchorElement* hovered_link_element = nullptr;
if (result.layout_node) { if (result.layout_node) {
RefPtr<Node> node = result.layout_node->node(); RefPtr<Node> node = result.layout_node->node();
@ -196,9 +193,11 @@ bool EventHandler::handle_mousemove(const Gfx::IntPoint& position, unsigned butt
} }
auto offset = compute_mouse_event_offset(position, *result.layout_node); auto offset = compute_mouse_event_offset(position, *result.layout_node);
node->dispatch_event(MouseEvent::create("mousemove", offset.x(), offset.y())); node->dispatch_event(MouseEvent::create("mousemove", offset.x(), offset.y()));
if (!layout_root())
return true;
} }
if (m_in_mouse_selection) { if (m_in_mouse_selection) {
layout_root.selection().set_end({ result.layout_node, result.index_in_node }); layout_root()->selection().set_end({ result.layout_node, result.index_in_node });
dump_selection("MouseMove"); dump_selection("MouseMove");
page_client.page_did_change_selection(); page_client.page_did_change_selection();
} }