Fix merge issues

Author: bghgary

Polyfills/Window/Source/TimeoutDispatcher.cpp

@@ -34,8 +34,8 @@ namespace Babylon::Polyfills::Internal
         Timeout(Timeout&&) = delete;
     };
 
-    TimeoutDispatcher::TimeoutDispatcher(Babylon::JsRuntime& runtime)
-        : m_runtime{runtime}
+    TimeoutDispatcher::TimeoutDispatcher(Babylon::JsRuntimeScheduler& runtimeScheduler)
+        : m_runtimeScheduler{runtimeScheduler}
         , m_thread{std::thread{&TimeoutDispatcher::ThreadFunction, this}}
     {
     }
@@ -71,7 +71,7 @@ namespace Babylon::Polyfills::Internal
 
         if (time <= earliestTime)
         {
-            m_runtime.Dispatch([this](Napi::Env) {
+            m_runtimeScheduler.Get()([this]() {
                 m_condVariable.notify_one();
             });
         }
@@ -158,7 +158,7 @@ namespace Babylon::Polyfills::Internal
     {
         if (function)
         {
-            m_runtime.Dispatch([function = std::move(function)](Napi::Env)
+            m_runtimeScheduler.Get()([function = std::move(function)]()
                 { function->Call({}); });
         }
     }

Polyfills/Window/Source/TimeoutDispatcher.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Babylon/JsRuntime.h>
+#include <Babylon/JsRuntimeScheduler.h>
 #include <napi/napi.h>
 
 #include <atomic>
@@ -19,7 +19,7 @@ namespace Babylon::Polyfills::Internal
         struct Timeout;
 
     public:
-        TimeoutDispatcher(Babylon::JsRuntime& runtime);
+        TimeoutDispatcher(Babylon::JsRuntimeScheduler& runtimeScheduler);
         ~TimeoutDispatcher();
 
         TimeoutId Dispatch(std::shared_ptr<Napi::FunctionReference> function, std::chrono::milliseconds delay);
@@ -32,7 +32,7 @@ namespace Babylon::Polyfills::Internal
         void ThreadFunction();
         void CallFunction(std::shared_ptr<Napi::FunctionReference> function);
 
-        Babylon::JsRuntime& m_runtime;
+        Babylon::JsRuntimeScheduler& m_runtimeScheduler;
         std::mutex m_mutex{};
         std::condition_variable m_condVariable{};
         TimeoutId m_lastTimeoutId{0};

Polyfills/Window/Source/Window.cpp

@@ -72,7 +72,7 @@ namespace Babylon::Polyfills::Internal
     Window::Window(const Napi::CallbackInfo& info)
         : Napi::ObjectWrap<Window>{info}
         , m_runtimeScheduler{JsRuntime::GetFromJavaScript(info.Env())}
-        , m_timeoutDispatcher{m_runtime}
+        , m_timeoutDispatcher{m_runtimeScheduler}
     {
     }
 
@@ -91,10 +91,9 @@ namespace Babylon::Polyfills::Internal
             ? std::make_shared<Napi::FunctionReference>(Napi::Persistent(info[0].As<Napi::Function>()))
             : std::shared_ptr<Napi::FunctionReference>{};
 
-        window.RecursiveWaitOrCall(Napi::Persistent(info.This()), std::move(function), std::chrono::system_clock::now() + milliseconds);
         auto delay = std::chrono::milliseconds{info[1].ToNumber().Int32Value()};
 
-        return Napi::Value::From(info.Env(), window.m_timeoutDispatcher->Dispatch(function, delay));
+        return Napi::Value::From(info.Env(), window.m_timeoutDispatcher.Dispatch(function, delay));
     }
 
     void Window::ClearTimeout(const Napi::CallbackInfo& info)
@@ -104,7 +103,7 @@ namespace Babylon::Polyfills::Internal
         {
             auto timeoutId = arg.As<Napi::Number>().Int32Value();
             auto& window = *static_cast<Window*>(info.Data());
-            window.m_timeoutDispatcher->Clear(timeoutId);
+            window.m_timeoutDispatcher.Clear(timeoutId);
         }
     }
 

Polyfills/Window/Source/Window.h

@@ -27,6 +27,6 @@ namespace Babylon::Polyfills::Internal
 
         arcana::cancellation_source m_cancelSource;
         JsRuntimeScheduler m_runtimeScheduler;
-        std::optional<TimeoutDispatcher> m_timeoutDispatcher;
+        TimeoutDispatcher m_timeoutDispatcher;
     };
 }