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

LibWeb: Make DOM timers cancellable and stop leaking them

Browse source 
This patch adds a Web::Timer object that represents a single timer
registration made with window.setTimeout() or window.setInterval().
All live timers are owned by the DOM Window object.

The timers can be stopped via clearTimeout() or clearInterval().
Note that those API's are actually interchangeable, but we have to
support both.
This commit is contained in:
Andreas Kling 2020-06-27 18:30:29 +02:00
parent e1aef94a40
commit 8d2194bdbd
8 changed files with 212 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Libraries/LibWeb/DOM/Window.h
View file

@ -27,6 +27,7 @@
#pragma once
#include <AK/Badge.h>
#include <AK/IDAllocator.h>
#include <AK/RefCounted.h>
#include <AK/RefPtr.h>
#include <LibWeb/Bindings/WindowObject.h>
@ -46,8 +47,11 @@ public:
bool confirm(const String&);
i32 request_animation_frame(JS::Function&);
void cancel_animation_frame(i32);
void set_interval(JS::Function&, i32);
void set_timeout(JS::Function&, i32);
i32 set_timeout(JS::Function&, i32);
i32 set_interval(JS::Function&, i32);
void clear_timeout(i32);
void clear_interval(i32);
void did_set_location_href(Badge<Bindings::LocationObject>, const String& new_href);
void did_call_location_reload(Badge<Bindings::LocationObject>);
@ -57,11 +61,17 @@ public:
void set_wrapper(Badge<Bindings::WindowObject>, Bindings::WindowObject&);
i32 allocate_timer_id(Badge<Timer>);
void timer_did_fire(Badge<Timer>, Timer&);
private:
explicit Window(Document&);
Document& m_document;
WeakPtr<Bindings::WindowObject> m_wrapper;
IDAllocator m_timer_id_allocator;
HashMap<int, NonnullRefPtr<Timer>> m_timers;
};
}