diff --git a/src/node_contextify.cc b/src/node_contextify.cc index d818e5816384d3..066aa137676843 100644 --- a/src/node_contextify.cc +++ b/src/node_contextify.cc @@ -566,7 +566,7 @@ Intercepted ContextifyContext::PropertyGetterCallback( Intercepted ContextifyContext::PropertySetterCallback( Local property, Local value, - const PropertyCallbackInfo& args) { + const PropertyCallbackInfo& args) { ContextifyContext* ctx = ContextifyContext::Get(args); // Still initializing @@ -689,7 +689,7 @@ Intercepted ContextifyContext::PropertyDescriptorCallback( Intercepted ContextifyContext::PropertyDefinerCallback( Local property, const PropertyDescriptor& desc, - const PropertyCallbackInfo& args) { + const PropertyCallbackInfo& args) { ContextifyContext* ctx = ContextifyContext::Get(args); // Still initializing @@ -898,7 +898,7 @@ Intercepted ContextifyContext::IndexedPropertyGetterCallback( Intercepted ContextifyContext::IndexedPropertySetterCallback( uint32_t index, Local value, - const PropertyCallbackInfo& args) { + const PropertyCallbackInfo& args) { ContextifyContext* ctx = ContextifyContext::Get(args); // Still initializing @@ -927,7 +927,7 @@ Intercepted ContextifyContext::IndexedPropertyDescriptorCallback( Intercepted ContextifyContext::IndexedPropertyDefinerCallback( uint32_t index, const PropertyDescriptor& desc, - const PropertyCallbackInfo& args) { + const PropertyCallbackInfo& args) { ContextifyContext* ctx = ContextifyContext::Get(args); // Still initializing diff --git a/src/node_contextify.h b/src/node_contextify.h index 1066633daf65d4..446cab2f580b65 100644 --- a/src/node_contextify.h +++ b/src/node_contextify.h @@ -153,14 +153,14 @@ class ContextifyContext final : CPPGC_MIXIN(ContextifyContext) { static v8::Intercepted PropertySetterCallback( v8::Local property, v8::Local value, - const v8::PropertyCallbackInfo& args); + const v8::PropertyCallbackInfo& args); static v8::Intercepted PropertyDescriptorCallback( v8::Local property, const v8::PropertyCallbackInfo& args); static v8::Intercepted PropertyDefinerCallback( v8::Local property, const v8::PropertyDescriptor& desc, - const v8::PropertyCallbackInfo& args); + const v8::PropertyCallbackInfo& args); static v8::Intercepted PropertyDeleterCallback( v8::Local property, const v8::PropertyCallbackInfo& args); @@ -173,13 +173,13 @@ class ContextifyContext final : CPPGC_MIXIN(ContextifyContext) { static v8::Intercepted IndexedPropertySetterCallback( uint32_t index, v8::Local value, - const v8::PropertyCallbackInfo& args); + const v8::PropertyCallbackInfo& args); static v8::Intercepted IndexedPropertyDescriptorCallback( uint32_t index, const v8::PropertyCallbackInfo& args); static v8::Intercepted IndexedPropertyDefinerCallback( uint32_t index, const v8::PropertyDescriptor& desc, - const v8::PropertyCallbackInfo& args); + const v8::PropertyCallbackInfo& args); static v8::Intercepted IndexedPropertyDeleterCallback( uint32_t index, const v8::PropertyCallbackInfo& args); static void IndexedPropertyEnumeratorCallback( diff --git a/src/node_env_var.cc b/src/node_env_var.cc index e94180cd659d35..533b955938c929 100644 --- a/src/node_env_var.cc +++ b/src/node_env_var.cc @@ -450,7 +450,7 @@ static Intercepted EnvGetter(Local property, static Intercepted EnvSetter(Local property, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); CHECK(env->has_run_bootstrapping_code()); // calling env->EmitProcessEnvWarning() sets a variable indicating that @@ -531,7 +531,7 @@ static void EnvEnumerator(const PropertyCallbackInfo& info) { static Intercepted EnvDefiner(Local property, const PropertyDescriptor& desc, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); if (desc.has_value()) { if (!desc.has_writable() || @@ -581,7 +581,7 @@ static Intercepted EnvGetterIndexed(uint32_t index, static Intercepted EnvSetterIndexed(uint32_t index, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); Local name = Uint32ToString(env->context(), index); return EnvSetter(name, value, info); @@ -601,9 +601,10 @@ static Intercepted EnvDeleterIndexed( return EnvDeleter(name, info); } -static Intercepted EnvDefinerIndexed(uint32_t index, - const PropertyDescriptor& desc, - const PropertyCallbackInfo& info) { +static Intercepted EnvDefinerIndexed( + uint32_t index, + const PropertyDescriptor& desc, + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); Local name = Uint32ToString(env->context(), index); return EnvDefiner(name, desc, info); diff --git a/src/node_external_reference.h b/src/node_external_reference.h index 5ce9ec0a8c207b..40e8a971b08302 100644 --- a/src/node_external_reference.h +++ b/src/node_external_reference.h @@ -20,18 +20,18 @@ class ExternalReferenceRegistry { #define ALLOWED_EXTERNAL_REFERENCE_TYPES(V) \ V(v8::FunctionCallback) \ V(v8::AccessorNameGetterCallback) \ - V(v8::AccessorNameSetterCallback) \ + V(v8::AccessorNameSetterCallbackV2) \ V(v8::NamedPropertyGetterCallback) \ - V(v8::NamedPropertyDefinerCallback) \ + V(v8::NamedPropertyDefinerCallbackV2) \ V(v8::NamedPropertyDeleterCallback) \ V(v8::NamedPropertyEnumeratorCallback) \ V(v8::NamedPropertyQueryCallback) \ - V(v8::NamedPropertySetterCallback) \ - V(v8::IndexedPropertyGetterCallbackV2) \ - V(v8::IndexedPropertySetterCallbackV2) \ - V(v8::IndexedPropertyDefinerCallbackV2) \ - V(v8::IndexedPropertyDeleterCallbackV2) \ - V(v8::IndexedPropertyQueryCallbackV2) \ + V(v8::NamedPropertySetterCallbackV2) \ + V(v8::IndexedPropertyGetterCallback) \ + V(v8::IndexedPropertySetterCallback) \ + V(v8::IndexedPropertyDefinerCallback) \ + V(v8::IndexedPropertyDeleterCallback) \ + V(v8::IndexedPropertyQueryCallback) \ V(const v8::String::ExternalStringResourceBase*) #define V(ExternalReferenceType) \ diff --git a/src/node_process_object.cc b/src/node_process_object.cc index 5f5af63486a556..3132a96abb87f9 100644 --- a/src/node_process_object.cc +++ b/src/node_process_object.cc @@ -12,6 +12,7 @@ #include // PATH_MAX namespace node { +using v8::Boolean; using v8::Context; using v8::EscapableHandleScope; using v8::Function; @@ -40,7 +41,7 @@ static void ProcessTitleGetter(Local property, static void ProcessTitleSetter(Local property, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { node::Utf8Value title(info.GetIsolate(), value); TRACE_EVENT_METADATA1( "__metadata", "process_name", "name", TRACE_STR_COPY(*title)); @@ -57,7 +58,7 @@ static void DebugPortGetter(Local property, static void DebugPortSetter(Local property, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); int32_t port = value->Int32Value(env->context()).FromMaybe(0); diff --git a/src/node_sqlite.cc b/src/node_sqlite.cc index d9f979c36b3ce5..31803e1b06bf85 100644 --- a/src/node_sqlite.cc +++ b/src/node_sqlite.cc @@ -774,7 +774,7 @@ Intercepted DatabaseSyncLimits::LimitsGetter( Intercepted DatabaseSyncLimits::LimitsSetter( Local property, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { if (!property->IsString()) { return Intercepted::kNo; } diff --git a/src/node_sqlite.h b/src/node_sqlite.h index e7281ed266af5d..fffa433d615461 100644 --- a/src/node_sqlite.h +++ b/src/node_sqlite.h @@ -433,7 +433,7 @@ class DatabaseSyncLimits : public BaseObject { static v8::Intercepted LimitsSetter( v8::Local property, v8::Local value, - const v8::PropertyCallbackInfo& info); + const v8::PropertyCallbackInfo& info); static v8::Intercepted LimitsQuery( v8::Local property, const v8::PropertyCallbackInfo& info); diff --git a/src/node_webstorage.cc b/src/node_webstorage.cc index 10c3ccd68e49a1..de899e25fe056c 100644 --- a/src/node_webstorage.cc +++ b/src/node_webstorage.cc @@ -598,7 +598,7 @@ static Intercepted StorageGetter(Local property, static Intercepted StorageSetter(Local property, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Storage* storage; ASSIGN_OR_RETURN_UNWRAP(&storage, info.HolderV2(), Intercepted::kNo); @@ -648,7 +648,7 @@ static void StorageEnumerator(const PropertyCallbackInfo& info) { static Intercepted StorageDefiner(Local property, const PropertyDescriptor& desc, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Storage* storage; ASSIGN_OR_RETURN_UNWRAP(&storage, info.HolderV2(), Intercepted::kNo); @@ -668,7 +668,7 @@ static Intercepted IndexedGetter(uint32_t index, static Intercepted IndexedSetter(uint32_t index, Local value, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); Local name = Uint32ToString(env->context(), index); return StorageSetter(name, value, info); @@ -690,7 +690,7 @@ static Intercepted IndexedDeleter(uint32_t index, static Intercepted IndexedDefiner(uint32_t index, const PropertyDescriptor& desc, - const PropertyCallbackInfo& info) { + const PropertyCallbackInfo& info) { Environment* env = Environment::GetCurrent(info); Local name = Uint32ToString(env->context(), index); return StorageDefiner(name, desc, info);