Changeset 295428 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Jun 9, 2022, 12:05:16 PM (3 years ago)

Author:

[email protected]

Message:

jsc's settimeout should properly handle a delay
​https://bugs.webkit.org/show_bug.cgi?id=240467

Reviewed by Yusuke Suzuki.

This patch makes it so that we properly handle a timeout passed to the JSC CLI setTimeout API. Previously we would just run the callback on the next runloop tick regardless of the passed value.

• Source/JavaScriptCore/jsc.cpp:

(JSC_DEFINE_HOST_FUNCTION):

Canonical link: ​https://commits.webkit.org/251434@main

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2526 +2526 @@
         return throwVMTypeError(globalObject, scope, "First argument is not a JS function"_s);
 
-    // FIXME: We don't look at the timeout parameter because we don't have a schedule work later API.
     auto ticket = vm.deferredWorkTimer->addPendingWork(vm, callback, { });
-    vm.deferredWorkTimer->scheduleWorkSoon(ticket, [callback](DeferredWorkTimer::Ticket) {
-        JSGlobalObject* globalObject = callback->globalObject();
-        MarkedArgumentBuffer args;
-        call(globalObject, callback, jsUndefined(), args, "You shouldn't see this..."_s);
-    });
+    auto dispatch = [callback, ticket] {
+        callback->vm().deferredWorkTimer->scheduleWorkSoon(ticket, [callback](DeferredWorkTimer::Ticket) {
+            JSGlobalObject* globalObject = callback->globalObject();
+            MarkedArgumentBuffer args;
+            call(globalObject, callback, jsUndefined(), args, "You shouldn't see this..."_s);
+        });
+    };
+
+    JSValue timeout = callFrame->argument(1);
+    if (timeout.isNumber() && timeout.asNumber())
+        RunLoop::current().dispatchAfter(Seconds::fromMilliseconds(timeout.asNumber()), WTFMove(dispatch));
+    else
+        dispatch();
+
     return JSValue::encode(jsUndefined());
 }