diff options
author | Sam Atkins <atkinssj@serenityos.org> | 2021-09-04 11:45:36 +0100 |
---|---|---|
committer | Andreas Kling <kling@serenityos.org> | 2021-09-06 18:20:26 +0200 |
commit | f6a927fa20723feb7c9bbb10d83bf7f220477a06 (patch) | |
tree | 17b7314653a335cbbb2ced8ed9cba002ba6130d6 /Userland/Services/WebContent/WebContentConsoleClient.cpp | |
parent | c619a57cf8f0d38c5acd71d6ae221b57b015a249 (diff) | |
download | serenity-f6a927fa20723feb7c9bbb10d83bf7f220477a06.zip |
WebContent: Store messages in WebContentConsoleClient
The `WebContentConsoleClient` now keeps a list of console messages it
has received, so these are not lost if the ConsoleWidget has not been
initialized yet.
This change does break JS console output, but only until the next
commit. :^)
Diffstat (limited to 'Userland/Services/WebContent/WebContentConsoleClient.cpp')
-rw-r--r-- | Userland/Services/WebContent/WebContentConsoleClient.cpp | 46 |
1 files changed, 42 insertions, 4 deletions
diff --git a/Userland/Services/WebContent/WebContentConsoleClient.cpp b/Userland/Services/WebContent/WebContentConsoleClient.cpp index b3a9c0ef9d..eb87b410cd 100644 --- a/Userland/Services/WebContent/WebContentConsoleClient.cpp +++ b/Userland/Services/WebContent/WebContentConsoleClient.cpp @@ -26,7 +26,7 @@ WebContentConsoleClient::WebContentConsoleClient(JS::Console& console, WeakPtr<J m_console_global_object = JS::make_handle(console_global_object); } -void WebContentConsoleClient::handle_input(const String& js_source) +void WebContentConsoleClient::handle_input(String const& js_source) { auto parser = JS::Parser(JS::Lexer(js_source)); auto program = parser.parse_program(); @@ -58,14 +58,52 @@ void WebContentConsoleClient::handle_input(const String& js_source) print_html(JS::MarkupGenerator::html_from_value(m_interpreter->vm().last_value())); } -void WebContentConsoleClient::print_html(const String& line) +void WebContentConsoleClient::print_html(String const& line) { - m_client.async_did_js_console_output("html", line); + m_message_log.append({ .type = ConsoleOutput::Type::HTML, .html = line }); + m_client.async_did_output_js_console_message(m_message_log.size() - 1); } void WebContentConsoleClient::clear_output() { - m_client.async_did_js_console_output("clear_output", {}); + m_message_log.append({ .type = ConsoleOutput::Type::Clear, .html = "" }); + m_client.async_did_output_js_console_message(m_message_log.size() - 1); +} + +void WebContentConsoleClient::send_messages(i32 start_index) +{ + // FIXME: Cap the number of messages we send at once? + auto messages_to_send = m_message_log.size() - start_index; + if (messages_to_send < 1) { + // When the console is first created, it requests any messages that happened before + // then, by requesting with start_index=0. If we don't have any messages at all, that + // is still a valid request, and we can just ignore it. + if (start_index != 0) + m_client.did_misbehave("Requested non-existent console message index."); + return; + } + + // FIXME: Replace with a single Vector of message structs + Vector<String> message_types; + Vector<String> messages; + message_types.ensure_capacity(messages_to_send); + messages.ensure_capacity(messages_to_send); + + for (size_t i = start_index; i < m_message_log.size(); i++) { + auto& message = m_message_log[i]; + switch (message.type) { + case ConsoleOutput::Type::HTML: + message_types.append("html"); + break; + case ConsoleOutput::Type::Clear: + message_types.append("clear"); + break; + } + + messages.append(message.html); + } + + m_client.async_did_get_js_console_messages(start_index, message_types, messages); } JS::Value WebContentConsoleClient::log() |