RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 23:37:36 +00:00
Code Issues Activity Actions

Browser: Implemented out of process JS console

Browse source 
Added input hook into console widget to allow input to be captured and
sent to the external JS console via IPC.

Output from the external JS console is fed into the console widget
via handle_js_console_output().
This commit is contained in:
Brandon Scott 2021-02-27 21:53:20 -06:00 • committed by Andreas Kling
parent 0682af7b65
commit 269ec8b1f9
3 changed files with 41 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Applications/Browser/ConsoleWidget.cpp
View file

@ -84,6 +84,13 @@ ConsoleWidget::ConsoleWidget()
print_source_line(js_source);
if (on_js_input)
on_js_input(js_source);
// no interpreter being set means we are running in multi-process mode
if (!m_interpreter)
return;
auto parser = JS::Parser(JS::Lexer(js_source));
auto program = parser.parse_program();
@ -130,6 +137,15 @@ ConsoleWidget::~ConsoleWidget()
{
}
void ConsoleWidget::handle_js_console_output(const String& method, const String& line)
{
if (method == "html") {
print_html(line);
} else if (method == "clear") {
clear_output();
}
}
void ConsoleWidget::set_interpreter(WeakPtr<JS::Interpreter> interpreter)
{
if (m_interpreter.ptr() == interpreter.ptr())

3
Userland/Applications/Browser/ConsoleWidget.h
View file

@ -40,10 +40,13 @@ public:
virtual ~ConsoleWidget();
void set_interpreter(WeakPtr<JS::Interpreter>);
void handle_js_console_output(const String& method, const String& line);
void print_source_line(const StringView&);
void print_html(const StringView&);
void clear_output();
Function<void(const String&)> on_js_input;
private:
ConsoleWidget();

23
Userland/Applications/Browser/Tab.cpp
View file

@ -251,6 +251,13 @@ Tab::Tab(Type type)
view_source(url.to_string(), source);
};
hooks().on_js_console_output = [this](auto& method, auto& line) {
if (m_console_window) {
auto* console_widget = static_cast<ConsoleWidget*>(m_console_window->main_widget());
console_widget->handle_js_console_output(method, line);
}
};
// FIXME: Support JS console in multi-process mode.
if (m_type == Type::InProcessWebView) {
hooks().on_set_document = [this](auto* document) {
@ -376,7 +383,21 @@ Tab::Tab(Type type)
m_console_window->show();
m_console_window->move_to_front();
} else {
TODO();
if (!m_console_window) {
m_console_window = GUI::Window::construct();
m_console_window->resize(500, 300);
m_console_window->set_title("JS Console");
m_console_window->set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/filetype-javascript.png"));
m_console_window->set_main_widget<ConsoleWidget>();
}
auto* console_widget = static_cast<ConsoleWidget*>(m_console_window->main_widget());
console_widget->on_js_input = [this](const String& js_source) {
m_web_content_view->js_console_input(js_source);
};
console_widget->clear_output();
m_web_content_view->js_console_initialize();
m_console_window->show();
m_console_window->move_to_front();
}
},
this));