4e8654e31b
Before the completion_steps for timer were casted from JS::SafeFunction to Function in HTML::Timer constructor, which is incorrect because then callback's captured GC-allocated objects are not protected from being deallocated. Let's modify HTML::Timer to use JS::HeapFunction for the callback instead.
52 lines
1.4 KiB
C++
52 lines
1.4 KiB
C++
/*
|
|
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
|
*
|
|
* SPDX-License-Identifier: BSD-2-Clause
|
|
*/
|
|
|
|
#include <LibCore/Timer.h>
|
|
#include <LibJS/Runtime/Object.h>
|
|
#include <LibWeb/HTML/Timer.h>
|
|
#include <LibWeb/HTML/Window.h>
|
|
|
|
namespace Web::HTML {
|
|
|
|
JS::NonnullGCPtr<Timer> Timer::create(JS::Object& window_or_worker_global_scope, i32 milliseconds, Function<void()> callback, i32 id)
|
|
{
|
|
auto heap_function_callback = JS::create_heap_function(window_or_worker_global_scope.heap(), move(callback));
|
|
return window_or_worker_global_scope.heap().allocate_without_realm<Timer>(window_or_worker_global_scope, milliseconds, heap_function_callback, id);
|
|
}
|
|
|
|
Timer::Timer(JS::Object& window_or_worker_global_scope, i32 milliseconds, JS::NonnullGCPtr<JS::HeapFunction<void()>> callback, i32 id)
|
|
: m_window_or_worker_global_scope(window_or_worker_global_scope)
|
|
, m_callback(move(callback))
|
|
, m_id(id)
|
|
{
|
|
m_timer = Core::Timer::create_single_shot(milliseconds, [this] {
|
|
m_callback->function()();
|
|
}).release_value_but_fixme_should_propagate_errors();
|
|
}
|
|
|
|
void Timer::visit_edges(Cell::Visitor& visitor)
|
|
{
|
|
Base::visit_edges(visitor);
|
|
visitor.visit(m_window_or_worker_global_scope.ptr());
|
|
visitor.visit(m_callback);
|
|
}
|
|
|
|
Timer::~Timer()
|
|
{
|
|
VERIFY(!m_timer->is_active());
|
|
}
|
|
|
|
void Timer::start()
|
|
{
|
|
m_timer->start();
|
|
}
|
|
|
|
void Timer::stop()
|
|
{
|
|
m_timer->stop();
|
|
}
|
|
|
|
}
|