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

LibWeb: Port the WindowOrWorkerGlobalScopeMixin timer handler to String

Browse source 
This will make porting to IDL a bit cleaner.
This commit is contained in:
Timothy Flynn 2023-03-14 07:06:32 -04:00 • committed by Tim Flynn
parent dd992e7dad
commit 2895b7e733
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibWeb/HTML/Window.cpp
View file

@ -1370,7 +1370,7 @@ static JS::ThrowCompletionOr<TimerHandler> make_timer_handler(JS::VM& vm, JS::Va
{
if (handler.is_function())
return JS::make_handle(vm.heap().allocate_without_realm<WebIDL::CallbackType>(handler.as_function(), incumbent_settings_object()));
return TRY(handler.to_deprecated_string(vm));
return TRY(handler.to_string(vm));
}
// https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#dom-settimeout

2
Userland/Libraries/LibWeb/HTML/WindowOrWorkerGlobalScope.cpp
View file

@ -211,7 +211,7 @@ i32 WindowOrWorkerGlobalScopeMixin::run_timer_initialization_steps(TimerHandler
report_exception(result, this_impl().realm());
},
// 3. Otherwise:
[&](DeprecatedString const& source) {
[&](String const& source) {
// 1. Assert: handler is a string.
// FIXME: 2. Perform HostEnsureCanCompileStrings(callerRealm, calleeRealm). If this throws an exception, catch it, report the exception, and abort these steps.

2
Userland/Libraries/LibWeb/HTML/WindowOrWorkerGlobalScope.h
View file

@ -18,7 +18,7 @@
namespace Web::HTML {
// https://html.spec.whatwg.org/#timerhandler
using TimerHandler = Variant<JS::Handle<WebIDL::CallbackType>, DeprecatedString>;
using TimerHandler = Variant<JS::Handle<WebIDL::CallbackType>, String>;
// https://html.spec.whatwg.org/multipage/webappapis.html#windoworworkerglobalscope
class WindowOrWorkerGlobalScopeMixin {