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

LibJS: Move Console from Interpreter to GlobalObject

Browse source 
Each JS global object has its own "console", so it makes more sense to
store it in GlobalObject.

We'll need some smartness later to bundle up console messages from all
the different frames that make up a page later, but this works for now.
This commit is contained in:
Andreas Kling 2020-09-29 21:15:06 +02:00
parent a9335eea1c
commit e4bda2e1e7
11 changed files with 55 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibJS/Console.h
View file

@ -40,12 +40,12 @@ class Console {
AK_MAKE_NONMOVABLE(Console);
public:
Console(Interpreter&);
explicit Console(GlobalObject&);
void set_client(ConsoleClient& client) { m_client = &client; }
Interpreter& interpreter() { return m_interpreter; }
const Interpreter& interpreter() const { return m_interpreter; }
GlobalObject& global_object() { return m_global_object; }
const GlobalObject& global_object() const { return m_global_object; }
HashMap<String, unsigned>& counters() { return m_counters; }
const HashMap<String, unsigned>& counters() const { return m_counters; }
@ -67,7 +67,7 @@ public:
bool counter_reset(String label);
private:
Interpreter& m_interpreter;
GlobalObject& m_global_object;
ConsoleClient* m_client { nullptr };
HashMap<String, unsigned> m_counters;
@ -91,8 +91,10 @@ public:
virtual Value count_reset() = 0;
protected:
Interpreter& interpreter() { return m_console.interpreter(); }
const Interpreter& interpreter() const { return m_console.interpreter(); }
VM& vm();
GlobalObject& global_object() { return m_console.global_object(); }
const GlobalObject& global_object() const { return m_console.global_object(); }
Vector<String> get_trace() const;