16
16
#include < vector>
17
17
18
18
using node::options_parser::kDisallowedInEnvironment ;
19
+ using v8::Array;
19
20
using v8::ArrayBuffer;
20
21
using v8::Boolean ;
21
22
using v8::Context;
@@ -27,6 +28,7 @@ using v8::Integer;
27
28
using v8::Isolate;
28
29
using v8::Local;
29
30
using v8::Locker;
31
+ using v8::MaybeLocal;
30
32
using v8::Number;
31
33
using v8::Object;
32
34
using v8::SealHandleScope;
@@ -414,30 +416,30 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
414
416
if (!args[0 ]->IsNullOrUndefined ()) {
415
417
Utf8Value value (
416
418
args.GetIsolate (),
417
- args[0 ]->ToString (env->context ()).FromMaybe (v8:: Local<v8:: String>()));
419
+ args[0 ]->ToString (env->context ()).FromMaybe (Local<String>()));
418
420
url.append (value.out (), value.length ());
419
421
}
420
422
421
423
if (args[1 ]->IsArray ()) {
422
- v8:: Local<v8:: Array> array = args[1 ].As <v8:: Array>();
424
+ Local<Array> array = args[1 ].As <Array>();
423
425
// The first argument is reserved for program name, but we don't need it
424
426
// in workers.
425
427
has_explicit_exec_argv = true ;
426
428
std::vector<std::string> exec_argv = {" " };
427
429
uint32_t length = array->Length ();
428
430
for (uint32_t i = 0 ; i < length; i++) {
429
- v8:: Local<v8:: Value> arg;
431
+ Local<Value> arg;
430
432
if (!array->Get (env->context (), i).ToLocal (&arg)) {
431
433
return ;
432
434
}
433
- v8:: MaybeLocal<v8:: String> arg_v8_string =
435
+ MaybeLocal<String> arg_v8_string =
434
436
arg->ToString (env->context ());
435
437
if (arg_v8_string.IsEmpty ()) {
436
438
return ;
437
439
}
438
440
Utf8Value arg_utf8_value (
439
441
args.GetIsolate (),
440
- arg_v8_string.FromMaybe (v8:: Local<v8:: String>()));
442
+ arg_v8_string.FromMaybe (Local<String>()));
441
443
std::string arg_string (arg_utf8_value.out (), arg_utf8_value.length ());
442
444
exec_argv.push_back (arg_string);
443
445
}
@@ -459,7 +461,7 @@ void Worker::New(const FunctionCallbackInfo<Value>& args) {
459
461
// The first argument is program name.
460
462
invalid_args.erase (invalid_args.begin ());
461
463
if (errors.size () > 0 || invalid_args.size () > 0 ) {
462
- v8:: Local<v8:: Value> error;
464
+ Local<Value> error;
463
465
if (!ToV8Value (env->context (),
464
466
errors.size () > 0 ? errors : invalid_args)
465
467
.ToLocal (&error)) {
0 commit comments