mirror of
https://github.com/RGBCube/serenity
synced 2025-10-31 06:42:43 +00:00
fbf9cb3387
Instead of creating a new global object and proxying everything through it, we now evaluate console inputs inside a `with` environment. This seems to match the behavior of WebKit and Gecko in my basic testing, and removes the ConsoleGlobalObject which has been a source of confusion and invalid downcasts. The globals now live in a class called ConsoleGlobalObjectExtensions (renamed from ConsoleGlobalObject since it's no longer a global object). To make this possible, I had to add a way to override the initial lexical environment when calling JS::Interpreter::run(). This is plumbed via Web::HTML::ClassicScript::run().
61 lines
1.7 KiB
C++
61 lines
1.7 KiB
C++
/*
|
|
* Copyright (c) 2021, Brandon Scott <xeon.productions@gmail.com>
|
|
* Copyright (c) 2020, Hunter Salyer <thefalsehonesty@gmail.com>
|
|
* Copyright (c) 2021-2022, Sam Atkins <atkinssj@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include "ConnectionFromClient.h"
|
|
#include <LibJS/Console.h>
|
|
#include <LibJS/Forward.h>
|
|
#include <LibWeb/Forward.h>
|
|
#include <WebContent/Forward.h>
|
|
|
|
namespace WebContent {
|
|
|
|
class WebContentConsoleClient final : public JS::ConsoleClient {
|
|
public:
|
|
WebContentConsoleClient(JS::Console&, JS::Realm&, ConnectionFromClient&);
|
|
|
|
void handle_input(DeprecatedString const& js_source);
|
|
void send_messages(i32 start_index);
|
|
void report_exception(JS::Error const&, bool) override;
|
|
|
|
private:
|
|
virtual void clear() override;
|
|
virtual JS::ThrowCompletionOr<JS::Value> printer(JS::Console::LogLevel log_level, PrinterArguments) override;
|
|
|
|
virtual void add_css_style_to_current_message(StringView style) override
|
|
{
|
|
m_current_message_style.append(style);
|
|
m_current_message_style.append(';');
|
|
}
|
|
|
|
ConnectionFromClient& m_client;
|
|
JS::Handle<ConsoleGlobalEnvironmentExtensions> m_console_global_environment_extensions;
|
|
|
|
void clear_output();
|
|
void print_html(DeprecatedString const& line);
|
|
void begin_group(DeprecatedString const& label, bool start_expanded);
|
|
virtual void end_group() override;
|
|
|
|
struct ConsoleOutput {
|
|
enum class Type {
|
|
HTML,
|
|
Clear,
|
|
BeginGroup,
|
|
BeginGroupCollapsed,
|
|
EndGroup,
|
|
};
|
|
Type type;
|
|
DeprecatedString data;
|
|
};
|
|
Vector<ConsoleOutput> m_message_log;
|
|
|
|
StringBuilder m_current_message_style;
|
|
};
|
|
|
|
}
|