diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index ee93c33b23..5702c3ae5d 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -98,7 +98,6 @@ set(SOURCES DOM/StaticRange.cpp DOM/Text.cpp DOM/Text.idl - DOM/Timer.cpp DOMParsing/InnerHTML.cpp DOMTreeModel.cpp Dump.cpp @@ -213,6 +212,7 @@ set(SOURCES HTML/SyntaxHighlighter/SyntaxHighlighter.cpp HTML/TagNames.cpp HTML/TextMetrics.cpp + HTML/Timer.cpp HTML/Window.cpp HTML/Worker.cpp HTML/WorkerDebugConsoleClient.cpp diff --git a/Userland/Libraries/LibWeb/Forward.h b/Userland/Libraries/LibWeb/Forward.h index 245a331602..5db7337726 100644 --- a/Userland/Libraries/LibWeb/Forward.h +++ b/Userland/Libraries/LibWeb/Forward.h @@ -119,7 +119,6 @@ class ShadowRoot; class StaticNodeList; class StaticRange; class Text; -class Timer; enum class QuirksMode; struct EventListenerOptions; struct AddEventListenerOptions; @@ -234,6 +233,7 @@ class WorkerDebugConsoleClient; class Storage; class SubmitEvent; class TextMetrics; +class Timer; class Window; class WindowEnvironmentSettingsObject; class Worker; diff --git a/Userland/Libraries/LibWeb/DOM/Timer.cpp b/Userland/Libraries/LibWeb/HTML/Timer.cpp similarity index 70% rename from Userland/Libraries/LibWeb/DOM/Timer.cpp rename to Userland/Libraries/LibWeb/HTML/Timer.cpp index e99a96de06..1ea86148f6 100644 --- a/Userland/Libraries/LibWeb/DOM/Timer.cpp +++ b/Userland/Libraries/LibWeb/HTML/Timer.cpp @@ -5,17 +5,17 @@ */ #include -#include +#include #include -namespace Web::DOM { +namespace Web::HTML { -NonnullRefPtr Timer::create(HTML::Window& window, i32 milliseconds, Function callback, i32 id) +NonnullRefPtr Timer::create(Window& window, i32 milliseconds, Function callback, i32 id) { return adopt_ref(*new Timer(window, milliseconds, move(callback), id)); } -Timer::Timer(HTML::Window& window, i32 milliseconds, Function callback, i32 id) +Timer::Timer(Window& window, i32 milliseconds, Function callback, i32 id) : m_window(window) , m_id(id) { diff --git a/Userland/Libraries/LibWeb/DOM/Timer.h b/Userland/Libraries/LibWeb/HTML/Timer.h similarity index 61% rename from Userland/Libraries/LibWeb/DOM/Timer.h rename to Userland/Libraries/LibWeb/HTML/Timer.h index a9fb3a0970..66553028a8 100644 --- a/Userland/Libraries/LibWeb/DOM/Timer.h +++ b/Userland/Libraries/LibWeb/HTML/Timer.h @@ -11,20 +11,20 @@ #include #include -namespace Web::DOM { +namespace Web::HTML { class Timer final : public RefCounted { public: - static NonnullRefPtr create(HTML::Window& window, i32 milliseconds, Function callback, i32 id); + static NonnullRefPtr create(Window& window, i32 milliseconds, Function callback, i32 id); ~Timer(); void start(); private: - Timer(HTML::Window& window, i32 milliseconds, Function callback, i32 id); + Timer(Window& window, i32 milliseconds, Function callback, i32 id); RefPtr m_timer; - HTML::Window& m_window; + Window& m_window; i32 m_id { 0 }; }; diff --git a/Userland/Libraries/LibWeb/HTML/Window.cpp b/Userland/Libraries/LibWeb/HTML/Window.cpp index cb6dc64a50..d8437d1064 100644 --- a/Userland/Libraries/LibWeb/HTML/Window.cpp +++ b/Userland/Libraries/LibWeb/HTML/Window.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -23,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -174,7 +174,7 @@ void Window::clear_interval(i32 id) m_timers.remove(id); } -void Window::deallocate_timer_id(Badge, i32 id) +void Window::deallocate_timer_id(Badge, i32 id) { m_timer_id_allocator.deallocate(id); } @@ -262,7 +262,7 @@ i32 Window::run_timer_initialization_steps(Bindings::TimerHandler handler, i32 t }; // 13. Run steps after a timeout given global, "setTimeout/setInterval", timeout, completionStep, and id. - auto timer = DOM::Timer::create(*this, timeout, move(completion_step), id); + auto timer = Timer::create(*this, timeout, move(completion_step), id); m_timers.set(id, timer); timer->start(); diff --git a/Userland/Libraries/LibWeb/HTML/Window.h b/Userland/Libraries/LibWeb/HTML/Window.h index 4a96829038..f9bca0fa15 100644 --- a/Userland/Libraries/LibWeb/HTML/Window.h +++ b/Userland/Libraries/LibWeb/HTML/Window.h @@ -76,7 +76,7 @@ public: void set_wrapper(Badge, Bindings::WindowObject&); - void deallocate_timer_id(Badge, i32); + void deallocate_timer_id(Badge, i32); HighResolutionTime::Performance& performance() { return *m_performance; } @@ -127,7 +127,7 @@ private: WeakPtr m_wrapper; IDAllocator m_timer_id_allocator; - HashMap> m_timers; + HashMap> m_timers; NonnullOwnPtr m_performance; NonnullRefPtr m_crypto;