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

LibWebView: Do not block the console for the initial message request

Browse source 
If we set m_waiting_for_messages to true for the intial message request,
we might never receive a response, and block the console from requesting
any more messages indefinitely. Instead, issue a non-blocking initial
request, which is how the Qt and Serenity chromes behaved before the
ConsoleClient abstraction.

This also changes ConsoleClient::clear() to use run_javascript() rather
than js_console_input(), as that is also how the chromes used to behave.
This commit is contained in:
Timothy Flynn 2023-08-30 06:45:08 -04:00 • committed by Tim Flynn
parent f56b772b29
commit 5eb0f65cc0
2 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWebView/ConsoleClient.cpp
View file

@ -34,7 +34,7 @@ ConsoleClient::ConsoleClient(ViewImplementation& content_web_view, ViewImplement
// Wait until our output WebView is loaded, and then request any messages that occurred before we existed. // Wait until our output WebView is loaded, and then request any messages that occurred before we existed.
m_console_web_view.on_load_finish = [this](auto const&) { m_console_web_view.on_load_finish = [this](auto const&) {
request_console_messages(0); m_content_web_view.js_console_request_messages(0);
}; };
m_console_web_view.use_native_user_style_sheet(); m_console_web_view.use_native_user_style_sheet();
@ -55,7 +55,7 @@ void ConsoleClient::execute(StringView script)
void ConsoleClient::clear() void ConsoleClient::clear()
{ {
m_console_web_view.js_console_input("document.body.innerHTML = \"\";"sv); m_console_web_view.run_javascript("document.body.innerHTML = \"\";"sv);
m_group_stack.clear(); m_group_stack.clear();
} }
@ -151,15 +151,10 @@ void ConsoleClient::print_html(StringView html)
} }
void ConsoleClient::request_console_messages() void ConsoleClient::request_console_messages()
{
request_console_messages(m_highest_received_message_index + 1);
}
void ConsoleClient::request_console_messages(i32 start_index)
{ {
VERIFY(!m_waiting_for_messages); VERIFY(!m_waiting_for_messages);
m_content_web_view.js_console_request_messages(start_index); m_content_web_view.js_console_request_messages(m_highest_received_message_index + 1);
m_waiting_for_messages = true; m_waiting_for_messages = true;
} }

1
Userland/Libraries/LibWebView/ConsoleClient.h
View file

@ -33,7 +33,6 @@ private:
void print_html(StringView); void print_html(StringView);
void request_console_messages(); void request_console_messages();
void request_console_messages(i32 start_index);
void begin_group(StringView label, bool start_expanded); void begin_group(StringView label, bool start_expanded);
void end_group(); void end_group();