From 3716e1b8a079919fe6f36f5f0b205d18456aabc6 Mon Sep 17 00:00:00 2001 From: Aliaksandr Kalenik Date: Sat, 11 Mar 2023 04:06:00 +0300 Subject: Ladybird: Delete unused ConsoleClient and ConsoleGlobalObject After the separation of LibWeb into WebContent process, ConsoleClient and ConsoleGlobalObject are no longer used. --- Ladybird/ConsoleClient.cpp | 202 --------------------------------------- Ladybird/ConsoleClient.h | 69 ------------- Ladybird/ConsoleGlobalObject.cpp | 114 ---------------------- Ladybird/ConsoleGlobalObject.h | 51 ---------- 4 files changed, 436 deletions(-) delete mode 100644 Ladybird/ConsoleClient.cpp delete mode 100644 Ladybird/ConsoleClient.h delete mode 100644 Ladybird/ConsoleGlobalObject.cpp delete mode 100644 Ladybird/ConsoleGlobalObject.h diff --git a/Ladybird/ConsoleClient.cpp b/Ladybird/ConsoleClient.cpp deleted file mode 100644 index 399ca986f0..0000000000 --- a/Ladybird/ConsoleClient.cpp +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (c) 2021, Brandon Scott - * Copyright (c) 2020, Hunter Salyer - * Copyright (c) 2021-2022, Sam Atkins - * Copyright (c) 2022, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include "ConsoleClient.h" -#include "ConsoleGlobalObject.h" -#include "SimpleWebView.h" -#include -#include -#include -#include -#include - -namespace Ladybird { - -ConsoleClient::ConsoleClient(JS::Console& console, JS::Realm& realm, SimpleWebView& view) - : JS::ConsoleClient(console) - , m_view(view) - , m_realm(realm) -{ - JS::DeferGC defer_gc(realm.heap()); - - auto& vm = realm.vm(); - auto& window = static_cast(realm.global_object()); - - auto console_global_object = realm.heap().allocate_without_realm(realm, window); - - // NOTE: We need to push an execution context here for NativeFunction::create() to succeed during global object initialization. - // It gets removed immediately after creating the interpreter in Document::interpreter(). - auto& eso = Web::Bindings::host_defined_environment_settings_object(realm); - vm.push_execution_context(eso.realm_execution_context()); - console_global_object->initialize(realm); - vm.pop_execution_context(); - - m_console_global_object = JS::make_handle(console_global_object); -} - -void ConsoleClient::handle_input(DeprecatedString const& js_source) -{ - if (!m_realm) - return; - - auto& settings = Web::Bindings::host_defined_environment_settings_object(*m_realm); - auto script = Web::HTML::ClassicScript::create("(console)", js_source, settings, settings.api_base_url()); - - // FIXME: Add parse error printouts back once ClassicScript can report parse errors. - - auto result = script->run(); - - StringBuilder output_html; - - if (result.is_abrupt()) { - output_html.append("Uncaught exception: "sv); - auto error = *result.release_error().value(); - if (error.is_object()) - output_html.append(JS::MarkupGenerator::html_from_error(error.as_object())); - else - output_html.append(JS::MarkupGenerator::html_from_value(error)); - print_html(output_html.string_view()); - return; - } - - if (result.value().has_value()) - print_html(JS::MarkupGenerator::html_from_value(*result.value())); -} - -void ConsoleClient::print_html(DeprecatedString const& line) -{ - m_message_log.append({ .type = ConsoleOutput::Type::HTML, .data = line }); - m_view.did_output_js_console_message(m_message_log.size() - 1); -} - -void ConsoleClient::clear_output() -{ - m_message_log.append({ .type = ConsoleOutput::Type::Clear, .data = "" }); - m_view.did_output_js_console_message(m_message_log.size() - 1); -} - -void ConsoleClient::begin_group(DeprecatedString const& label, bool start_expanded) -{ - m_message_log.append({ .type = start_expanded ? ConsoleOutput::Type::BeginGroup : ConsoleOutput::Type::BeginGroupCollapsed, .data = label }); - m_view.did_output_js_console_message(m_message_log.size() - 1); -} - -void ConsoleClient::end_group() -{ - m_message_log.append({ .type = ConsoleOutput::Type::EndGroup, .data = "" }); - m_view.did_output_js_console_message(m_message_log.size() - 1); -} - -void ConsoleClient::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. - return; - } - - // FIXME: Replace with a single Vector of message structs - Vector message_types; - Vector 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"sv); - break; - case ConsoleOutput::Type::Clear: - message_types.append("clear"sv); - break; - case ConsoleOutput::Type::BeginGroup: - message_types.append("group"sv); - break; - case ConsoleOutput::Type::BeginGroupCollapsed: - message_types.append("groupCollapsed"sv); - break; - case ConsoleOutput::Type::EndGroup: - message_types.append("groupEnd"sv); - break; - } - - messages.append(message.data); - } - - m_view.did_get_js_console_messages(start_index, message_types, messages); -} - -void ConsoleClient::clear() -{ - clear_output(); -} - -// 2.3. Printer(logLevel, args[, options]), https://console.spec.whatwg.org/#printer -JS::ThrowCompletionOr ConsoleClient::printer(JS::Console::LogLevel log_level, PrinterArguments arguments) -{ - auto styling = escape_html_entities(m_current_message_style.string_view()); - m_current_message_style.clear(); - - if (log_level == JS::Console::LogLevel::Trace) { - auto trace = arguments.get(); - StringBuilder html; - if (!trace.label.is_empty()) - html.appendff("{}
", escape_html_entities(trace.label)); - - html.append(""sv); - for (auto& function_name : trace.stack) - html.appendff("-> {}
", escape_html_entities(function_name)); - html.append(""sv); - - print_html(html.string_view()); - return JS::js_undefined(); - } - - if (log_level == JS::Console::LogLevel::Group || log_level == JS::Console::LogLevel::GroupCollapsed) { - auto group = arguments.get(); - begin_group(DeprecatedString::formatted("{}", styling, escape_html_entities(group.label)), log_level == JS::Console::LogLevel::Group); - return JS::js_undefined(); - } - - auto output = TRY(generically_format_values(arguments.get>())); - m_console.output_debug_message(log_level, output); - - StringBuilder html; - switch (log_level) { - case JS::Console::LogLevel::Debug: - html.appendff("(d) "sv, styling); - break; - case JS::Console::LogLevel::Error: - html.appendff("(e) "sv, styling); - break; - case JS::Console::LogLevel::Info: - html.appendff("(i) "sv, styling); - break; - case JS::Console::LogLevel::Log: - html.appendff(" "sv, styling); - break; - case JS::Console::LogLevel::Warn: - case JS::Console::LogLevel::CountReset: - html.appendff("(w) "sv, styling); - break; - default: - html.appendff(""sv, styling); - break; - } - - html.append(escape_html_entities(output)); - html.append(""sv); - print_html(html.string_view()); - return JS::js_undefined(); -} -} diff --git a/Ladybird/ConsoleClient.h b/Ladybird/ConsoleClient.h deleted file mode 100644 index 01c60faadc..0000000000 --- a/Ladybird/ConsoleClient.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright (c) 2022, Brandon Scott - * Copyright (c) 2020, Hunter Salyer - * Copyright (c) 2021-2022, Sam Atkins - * Copyright (c) 2022, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#define AK_DONT_REPLACE_STD - -#include "ConsoleGlobalObject.h" -#include -#include -#include -#include - -class SimpleWebView; - -namespace Ladybird { - -class ConsoleClient final : public JS::ConsoleClient { -public: - ConsoleClient(JS::Console&, JS::Realm&, SimpleWebView&); - - void handle_input(DeprecatedString const& js_source); - void send_messages(i32 start_index); - -private: - virtual void clear() override; - virtual JS::ThrowCompletionOr 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(';'); - } - - SimpleWebView& m_view; - - WeakPtr m_interpreter; - JS::Handle m_console_global_object; - - 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 m_message_log; - - StringBuilder m_current_message_style; - - WeakPtr m_realm; -}; - -} diff --git a/Ladybird/ConsoleGlobalObject.cpp b/Ladybird/ConsoleGlobalObject.cpp deleted file mode 100644 index e218433829..0000000000 --- a/Ladybird/ConsoleGlobalObject.cpp +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Copyright (c) 2021, Sam Atkins - * Copyright (c) 2022, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include "ConsoleGlobalObject.h" -#include -#include -#include - -namespace Ladybird { - -ConsoleGlobalObject::ConsoleGlobalObject(JS::Realm& realm, Web::HTML::Window& parent_object) - : JS::GlobalObject(realm) - , m_window_object(&parent_object) -{ -} - -JS::ThrowCompletionOr ConsoleGlobalObject::initialize(JS::Realm& realm) -{ - MUST_OR_THROW_OOM(Base::initialize(realm)); - - // $0 magic variable - define_native_accessor(realm, "$0", inspected_node_getter, nullptr, 0); - - return {}; -} - -void ConsoleGlobalObject::visit_edges(Visitor& visitor) -{ - Base::visit_edges(visitor); - visitor.visit(m_window_object); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_get_prototype_of() const -{ - return m_window_object->internal_get_prototype_of(); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_set_prototype_of(JS::Object* prototype) -{ - return m_window_object->internal_set_prototype_of(prototype); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_is_extensible() const -{ - return m_window_object->internal_is_extensible(); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_prevent_extensions() -{ - return m_window_object->internal_prevent_extensions(); -} - -JS::ThrowCompletionOr> ConsoleGlobalObject::internal_get_own_property(JS::PropertyKey const& property_name) const -{ - if (auto result = TRY(m_window_object->internal_get_own_property(property_name)); result.has_value()) - return result; - - return Base::internal_get_own_property(property_name); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_define_own_property(JS::PropertyKey const& property_name, JS::PropertyDescriptor const& descriptor) -{ - return m_window_object->internal_define_own_property(property_name, descriptor); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_has_property(JS::PropertyKey const& property_name) const -{ - return TRY(Object::internal_has_property(property_name)) || TRY(m_window_object->internal_has_property(property_name)); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_get(JS::PropertyKey const& property_name, JS::Value receiver) const -{ - if (TRY(m_window_object->has_own_property(property_name))) - return m_window_object->internal_get(property_name, (receiver == this) ? m_window_object : receiver); - - return Base::internal_get(property_name, receiver); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_set(JS::PropertyKey const& property_name, JS::Value value, JS::Value receiver) -{ - return m_window_object->internal_set(property_name, value, (receiver == this) ? m_window_object : receiver); -} - -JS::ThrowCompletionOr ConsoleGlobalObject::internal_delete(JS::PropertyKey const& property_name) -{ - return m_window_object->internal_delete(property_name); -} - -JS::ThrowCompletionOr> ConsoleGlobalObject::internal_own_property_keys() const -{ - return m_window_object->internal_own_property_keys(); -} - -JS_DEFINE_NATIVE_FUNCTION(ConsoleGlobalObject::inspected_node_getter) -{ - auto* this_object = TRY(vm.this_value().to_object(vm)); - - if (!is(this_object)) - return vm.throw_completion(JS::ErrorType::NotAnObjectOfType, "ConsoleGlobalObject"); - - auto console_global_object = static_cast(this_object); - auto& window = *console_global_object->m_window_object; - auto* inspected_node = window.associated_document().inspected_node(); - if (!inspected_node) - return JS::js_undefined(); - - return &*inspected_node; -} - -} diff --git a/Ladybird/ConsoleGlobalObject.h b/Ladybird/ConsoleGlobalObject.h deleted file mode 100644 index d6f3e8d1da..0000000000 --- a/Ladybird/ConsoleGlobalObject.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2021, Sam Atkins - * Copyright (c) 2022, Andreas Kling - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#define AK_DONT_REPLACE_STD - -#include -#include -#include - -namespace Web::HTML { -class Window; -} - -namespace Ladybird { - -class ConsoleGlobalObject final : public JS::GlobalObject { - JS_OBJECT(ConsoleGlobalObject, JS::GlobalObject); - -public: - ConsoleGlobalObject(JS::Realm&, Web::HTML::Window&); - virtual JS::ThrowCompletionOr initialize(JS::Realm&) override; - virtual ~ConsoleGlobalObject() override = default; - - virtual JS::ThrowCompletionOr internal_get_prototype_of() const override; - virtual JS::ThrowCompletionOr internal_set_prototype_of(Object* prototype) override; - virtual JS::ThrowCompletionOr internal_is_extensible() const override; - virtual JS::ThrowCompletionOr internal_prevent_extensions() override; - virtual JS::ThrowCompletionOr> internal_get_own_property(JS::PropertyKey const& name) const override; - virtual JS::ThrowCompletionOr internal_define_own_property(JS::PropertyKey const& name, JS::PropertyDescriptor const& descriptor) override; - virtual JS::ThrowCompletionOr internal_has_property(JS::PropertyKey const& name) const override; - virtual JS::ThrowCompletionOr internal_get(JS::PropertyKey const&, JS::Value) const override; - virtual JS::ThrowCompletionOr internal_set(JS::PropertyKey const&, JS::Value value, JS::Value receiver) override; - virtual JS::ThrowCompletionOr internal_delete(JS::PropertyKey const& name) override; - virtual JS::ThrowCompletionOr> internal_own_property_keys() const override; - -private: - virtual void visit_edges(Visitor&) override; - - // Because $0 is not a nice C++ function name - JS_DECLARE_NATIVE_FUNCTION(inspected_node_getter); - - Web::HTML::Window* m_window_object; -}; - -} -- cgit v1.2.3