RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 21:22:46 +00:00
Code Issues Activity Actions

LibWeb: Add basic support for script string argument to setTimeout()

Browse source 
Instead of passing a function it is also possible to pass a string,
which is then evaluated as a classic script.

This means we now support the following example from the "timer
initialization steps", step 16 - except that it runs the timers in
reverse order, so the `log` result is `"TWO ONE "`.

https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#timer-initialisation-steps

    var log = '';
    function logger(s) { log += s + ' '; }

    setTimeout({ toString: function () {
      setTimeout("logger('ONE')", 100);
      return "logger('TWO')";
    } }, 100);
This commit is contained in:
Linus Groh 2021-10-04 00:13:38 +01:00
parent 32b620c62d
commit 9f4ac38f08
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Userland/Libraries/LibWeb/Bindings/WindowObject.cpp
View file

@ -37,6 +37,7 @@
#include <LibWeb/DOM/Event.h> #include <LibWeb/DOM/Event.h>
#include <LibWeb/DOM/Window.h> #include <LibWeb/DOM/Window.h>
#include <LibWeb/HTML/EventHandler.h> #include <LibWeb/HTML/EventHandler.h>
#include <LibWeb/HTML/Scripting/ClassicScript.h>
#include <LibWeb/Origin.h> #include <LibWeb/Origin.h>
#include <LibWeb/Page/BrowsingContext.h> #include <LibWeb/Page/BrowsingContext.h>
#include <LibWeb/Page/Page.h> #include <LibWeb/Page/Page.h>
@ -259,8 +260,11 @@ JS_DEFINE_NATIVE_FUNCTION(WindowObject::set_interval)
return JS::Value(timer_id); return JS::Value(timer_id);
} }
// https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#dom-settimeout
JS_DEFINE_NATIVE_FUNCTION(WindowObject::set_timeout) JS_DEFINE_NATIVE_FUNCTION(WindowObject::set_timeout)
{ {
// FIXME: Ideally this would share more code with setInterval() using the "timer initialization steps"
// https://html.spec.whatwg.org/multipage/timers-and-user-prompts.html#timer-initialisation-steps
auto* impl = impl_from(vm, global_object); auto* impl = impl_from(vm, global_object);
if (!impl) if (!impl)
return {}; return {};
@ -268,12 +272,21 @@ JS_DEFINE_NATIVE_FUNCTION(WindowObject::set_timeout)
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::BadArgCountAtLeastOne, "setTimeout"); vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::BadArgCountAtLeastOne, "setTimeout");
return {}; return {};
} }
auto* callback_object = vm.argument(0).to_object(global_object); JS::FunctionObject* callback;
if (!callback_object) if (vm.argument(0).is_function()) {
return {}; callback = &vm.argument(0).as_function();
if (!callback_object->is_function()) { } else {
vm.throw_exception<JS::TypeError>(global_object, JS::ErrorType::NotAFunctionNoParam); auto script_source = vm.argument(0).to_string(global_object);
return {}; if (vm.exception())
return {};
// FIXME: This needs more work once we have a environment settings object.
// The script wants us to use a task for the "run function or script string" part,
// using a NativeFunction for the latter is a workaround so that we can reuse the
// DOM::Timer API unaltered (always expects a JS::FunctionObject).
callback = JS::NativeFunction::create(global_object, "", [impl, script_source = move(script_source)](auto&, auto&) mutable {
auto script = HTML::ClassicScript::create(impl->associated_document().url().to_string(), script_source, impl->associated_document().realm(), AK::URL());
return script->run();
});
} }
i32 interval = 0; i32 interval = 0;
if (vm.argument_count() >= 2) { if (vm.argument_count() >= 2) {
@ -283,8 +296,8 @@ JS_DEFINE_NATIVE_FUNCTION(WindowObject::set_timeout)
if (interval < 0) if (interval < 0)
interval = 0; interval = 0;
} }
// FIXME: Pass ...arguments to the callback function when it's invoked
auto timer_id = impl->set_timeout(*static_cast<JS::FunctionObject*>(callback_object), interval); auto timer_id = impl->set_timeout(*callback, interval);
return JS::Value(timer_id); return JS::Value(timer_id);
} }