diff --git a/Userland/Applications/Browser/BrowserConsoleClient.cpp b/Userland/Applications/Browser/BrowserConsoleClient.cpp deleted file mode 100644 index 1c854c4503..0000000000 --- a/Userland/Applications/Browser/BrowserConsoleClient.cpp +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright (c) 2020, Hunter Salyer - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#include "BrowserConsoleClient.h" -#include "ConsoleWidget.h" -#include -#include -#include -#include -#include -#include - -namespace Browser { - -JS::Value BrowserConsoleClient::log() -{ - m_console_widget.print_html(escape_html_entities(vm().join_arguments())); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::info() -{ - StringBuilder html; - html.append(""); - html.append("(i) "); - html.append(escape_html_entities(vm().join_arguments())); - html.append(""); - m_console_widget.print_html(html.string_view()); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::debug() -{ - StringBuilder html; - html.append(""); - html.append("(d) "); - html.append(escape_html_entities(vm().join_arguments())); - html.append(""); - m_console_widget.print_html(html.string_view()); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::warn() -{ - StringBuilder html; - html.append(""); - html.append("(w) "); - html.append(escape_html_entities(vm().join_arguments())); - html.append(""); - m_console_widget.print_html(html.string_view()); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::error() -{ - StringBuilder html; - html.append(""); - html.append("(e) "); - html.append(escape_html_entities(vm().join_arguments())); - html.append(""); - m_console_widget.print_html(html.string_view()); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::clear() -{ - m_console_widget.clear_output(); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::trace() -{ - StringBuilder html; - html.append(escape_html_entities(vm().join_arguments())); - auto trace = get_trace(); - for (auto& function_name : trace) { - if (function_name.is_empty()) - function_name = "<anonymous>"; - html.appendff(" -> {}
", function_name); - } - m_console_widget.print_html(html.string_view()); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::count() -{ - auto label = vm().argument_count() ? vm().argument(0).to_string_without_side_effects() : "default"; - auto counter_value = m_console.counter_increment(label); - m_console_widget.print_html(String::formatted("{}: {}", label, counter_value)); - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::count_reset() -{ - auto label = vm().argument_count() ? vm().argument(0).to_string_without_side_effects() : "default"; - if (m_console.counter_reset(label)) { - m_console_widget.print_html(String::formatted("{}: 0", label)); - } else { - m_console_widget.print_html(String::formatted("\"{}\" doesn't have a count", label)); - } - return JS::js_undefined(); -} - -JS::Value BrowserConsoleClient::assert_() -{ - auto& vm = this->vm(); - if (!vm.argument(0).to_boolean()) { - StringBuilder html; - if (vm.argument_count() > 1) { - html.append(""); - html.append("Assertion failed:"); - html.append(""); - html.append(" "); - html.append(escape_html_entities(vm.join_arguments(1))); - } else { - html.append(""); - html.append("Assertion failed"); - html.append(""); - } - m_console_widget.print_html(html.string_view()); - } - return JS::js_undefined(); -} - -} diff --git a/Userland/Applications/Browser/BrowserConsoleClient.h b/Userland/Applications/Browser/BrowserConsoleClient.h deleted file mode 100644 index 7c99f69e40..0000000000 --- a/Userland/Applications/Browser/BrowserConsoleClient.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2020, Hunter Salyer - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include -#include -#include - -namespace Browser { - -class ConsoleWidget; - -class BrowserConsoleClient final : public JS::ConsoleClient { -public: - BrowserConsoleClient(JS::Console& console, ConsoleWidget& console_widget) - : ConsoleClient(console) - , m_console_widget(console_widget) - { - } - -private: - virtual JS::Value log() override; - virtual JS::Value info() override; - virtual JS::Value debug() override; - virtual JS::Value warn() override; - virtual JS::Value error() override; - virtual JS::Value clear() override; - virtual JS::Value trace() override; - virtual JS::Value count() override; - virtual JS::Value count_reset() override; - virtual JS::Value assert_() override; - - ConsoleWidget& m_console_widget; -}; - -} diff --git a/Userland/Applications/Browser/CMakeLists.txt b/Userland/Applications/Browser/CMakeLists.txt index 4cb8648b90..f9d01126db 100644 --- a/Userland/Applications/Browser/CMakeLists.txt +++ b/Userland/Applications/Browser/CMakeLists.txt @@ -11,7 +11,6 @@ compile_gml(Tab.gml TabGML.h tab_gml) set(SOURCES BookmarksBarWidget.cpp - BrowserConsoleClient.cpp BrowserWindow.cpp BrowserWindowGML.h ConsoleWidget.cpp