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

LibWeb: Change HTML::Timer to store its owning window as a JS::Object

Browse source 
Rather than being limited to a Window object, it will also need to be
ownable by a WorkerGlobalScope.
This commit is contained in:
Timothy Flynn 2023-03-14 06:55:34 -04:00 • committed by Tim Flynn
parent ea11a84332
commit b579093ad0
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Userland/Libraries/LibWeb/HTML/Timer.cpp
View file

@ -4,19 +4,20 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibJS/Runtime/Object.h>
#include <LibWeb/HTML/Timer.h> #include <LibWeb/HTML/Timer.h>
#include <LibWeb/HTML/Window.h> #include <LibWeb/HTML/Window.h>
#include <LibWeb/Platform/Timer.h> #include <LibWeb/Platform/Timer.h>
namespace Web::HTML { namespace Web::HTML {
JS::NonnullGCPtr<Timer> Timer::create(Window& window, i32 milliseconds, Function<void()> callback, i32 id) JS::NonnullGCPtr<Timer> Timer::create(JS::Object& window_or_worker_global_scope, i32 milliseconds, Function<void()> callback, i32 id)
{ {
return window.heap().allocate_without_realm<Timer>(window, milliseconds, move(callback), id); return window_or_worker_global_scope.heap().allocate_without_realm<Timer>(window_or_worker_global_scope, milliseconds, move(callback), id);
} }
Timer::Timer(Window& window, i32 milliseconds, Function<void()> callback, i32 id) Timer::Timer(JS::Object& window_or_worker_global_scope, i32 milliseconds, Function<void()> callback, i32 id)
: m_window(window) : m_window_or_worker_global_scope(window_or_worker_global_scope)
, m_callback(move(callback)) , m_callback(move(callback))
, m_id(id) , m_id(id)
{ {
@ -28,7 +29,7 @@ Timer::Timer(Window& window, i32 milliseconds, Function<void()> callback, i32 id
void Timer::visit_edges(Cell::Visitor& visitor) void Timer::visit_edges(Cell::Visitor& visitor)
{ {
Base::visit_edges(visitor); Base::visit_edges(visitor);
visitor.visit(m_window.ptr()); visitor.visit(m_window_or_worker_global_scope.ptr());
} }
Timer::~Timer() Timer::~Timer()

6
Userland/Libraries/LibWeb/HTML/Timer.h
View file

@ -20,18 +20,18 @@ class Timer final : public JS::Cell {
JS_CELL(Timer, JS::Cell); JS_CELL(Timer, JS::Cell);
public: public:
static JS::NonnullGCPtr<Timer> create(Window&, i32 milliseconds, Function<void()> callback, i32 id); static JS::NonnullGCPtr<Timer> create(JS::Object&, i32 milliseconds, Function<void()> callback, i32 id);
virtual ~Timer() override; virtual ~Timer() override;
void start(); void start();
private: private:
Timer(Window& window, i32 milliseconds, Function<void()> callback, i32 id); Timer(JS::Object& window, i32 milliseconds, Function<void()> callback, i32 id);
virtual void visit_edges(Cell::Visitor&) override; virtual void visit_edges(Cell::Visitor&) override;
RefPtr<Platform::Timer> m_timer; RefPtr<Platform::Timer> m_timer;
JS::NonnullGCPtr<Window> m_window; JS::NonnullGCPtr<JS::Object> m_window_or_worker_global_scope;
Function<void()> m_callback; Function<void()> m_callback;
i32 m_id { 0 }; i32 m_id { 0 };
}; };