system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibWeb: Exit event handlers if active document is not fully active

Browse source 
Fixes https://github.com/SerenityOS/serenity/issues/21304
This commit is contained in:
Aliaksandr Kalenik 2023-10-03 15:35:07 +02:00 committed by Andreas Kling
parent ff72436448
commit 9df00d0677
1 changed files with 40 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
Userland/Libraries/LibWeb/Page/EventHandler.cpp
View file

@ -146,8 +146,12 @@ Painting::PaintableBox const* EventHandler::paint_root() const
bool EventHandler::handle_mousewheel(CSSPixelPoint position, CSSPixelPoint screen_position, unsigned button, unsigned buttons, unsigned int modifiers, int wheel_delta_x, int wheel_delta_y)
{
if (m_browsing_context->active_document())
m_browsing_context->active_document()->update_layout();
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
m_browsing_context->active_document()->update_layout();
if (!paint_root())
return false;
@ -205,8 +209,12 @@ bool EventHandler::handle_mousewheel(CSSPixelPoint position, CSSPixelPoint scree
bool EventHandler::handle_mouseup(CSSPixelPoint position, CSSPixelPoint screen_position, unsigned button, unsigned buttons, unsigned modifiers)
{
if (m_browsing_context->active_document())
m_browsing_context->active_document()->update_layout();
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
m_browsing_context->active_document()->update_layout();
if (!paint_root())
return false;
@ -321,8 +329,12 @@ after_node_use:
bool EventHandler::handle_mousedown(CSSPixelPoint position, CSSPixelPoint screen_position, unsigned button, unsigned buttons, unsigned modifiers)
{
if (m_browsing_context->active_document())
m_browsing_context->active_document()->update_layout();
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
m_browsing_context->active_document()->update_layout();
if (!paint_root())
return false;
@ -413,8 +425,12 @@ bool EventHandler::handle_mousedown(CSSPixelPoint position, CSSPixelPoint screen
bool EventHandler::handle_mousemove(CSSPixelPoint position, CSSPixelPoint screen_position, unsigned buttons, unsigned modifiers)
{
if (m_browsing_context->active_document())
m_browsing_context->active_document()->update_layout();
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
m_browsing_context->active_document()->update_layout();
if (!paint_root())
return false;
@ -533,8 +549,12 @@ bool EventHandler::handle_mousemove(CSSPixelPoint position, CSSPixelPoint screen
bool EventHandler::handle_doubleclick(CSSPixelPoint position, CSSPixelPoint screen_position, unsigned button, unsigned buttons, unsigned modifiers)
{
if (m_browsing_context->active_document())
m_browsing_context->active_document()->update_layout();
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
m_browsing_context->active_document()->update_layout();
if (!paint_root())
return false;
@ -628,6 +648,9 @@ bool EventHandler::focus_next_element()
{
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
auto* element = m_browsing_context->active_document()->focused_element();
if (!element) {
element = m_browsing_context->active_document()->first_child_of_type<DOM::Element>();
@ -648,6 +671,9 @@ bool EventHandler::focus_previous_element()
{
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
auto* element = m_browsing_context->active_document()->focused_element();
if (!element) {
element = m_browsing_context->active_document()->last_child_of_type<DOM::Element>();
@ -676,6 +702,8 @@ bool EventHandler::fire_keyboard_event(FlyString const& event_name, HTML::Browsi
JS::GCPtr<DOM::Document> document = browsing_context.active_document();
if (!document)
return false;
if (!document->is_fully_active())
return false;
if (JS::GCPtr<DOM::Element> focused_element = document->focused_element()) {
if (is<HTML::NavigableContainer>(*focused_element)) {
@ -701,6 +729,8 @@ bool EventHandler::handle_keydown(KeyCode key, unsigned modifiers, u32 code_poin
{
if (!m_browsing_context->active_document())
return false;
if (!m_browsing_context->active_document()->is_fully_active())
return false;
JS::NonnullGCPtr<DOM::Document> document = *m_browsing_context->active_document();
if (!document->layout_node())