src: remove excess v8 namespace

himself65 · targos · commit ad347f4cbb55 · 2020-04-22T18:26:48.000+02:00
PR-URL: #32191 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/node_crypto.cc b/src/node_crypto.cc
@@ -499,7 +499,7 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {
   env->set_secure_context_constructor_template(t);
 }
 
-SecureContext::SecureContext(Environment* env, v8::Local<v8::Object> wrap)
+SecureContext::SecureContext(Environment* env, Local<Object> wrap)
     : BaseObject(env, wrap) {
   MakeWeak();
   env->isolate()->AdjustAmountOfExternalAllocatedMemory(kExternalSize);
@@ -3249,7 +3249,7 @@ KeyType KeyObject::GetKeyType() const {
 }
 
 KeyObject::KeyObject(Environment* env,
-                     v8::Local<v8::Object> wrap,
+                     Local<Object> wrap,
                      KeyType key_type)
     : BaseObject(env, wrap),
       key_type_(key_type),
@@ -3294,7 +3294,7 @@ void KeyObject::Init(const FunctionCallbackInfo<Value>& args) {
   }
 }
 
-void KeyObject::InitSecret(v8::Local<v8::ArrayBufferView> abv) {
+void KeyObject::InitSecret(Local<ArrayBufferView> abv) {
   CHECK_EQ(this->key_type_, kKeyTypeSecret);
 
   size_t key_len = abv->ByteLength();
@@ -3356,7 +3356,7 @@ void KeyObject::GetSymmetricKeySize(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(static_cast<uint32_t>(key->GetSymmetricKeySize()));
 }
 
-void KeyObject::Export(const v8::FunctionCallbackInfo<v8::Value>& args) {
+void KeyObject::Export(const FunctionCallbackInfo<Value>& args) {
   KeyObject* key;
   ASSIGN_OR_RETURN_UNWRAP(&key, args.Holder());
 
@@ -3400,7 +3400,7 @@ MaybeLocal<Value> KeyObject::ExportPrivateKey(
 }
 
 CipherBase::CipherBase(Environment* env,
-                       v8::Local<v8::Object> wrap,
+                       Local<Object> wrap,
                        CipherKind kind)
     : BaseObject(env, wrap),
       ctx_(nullptr),
@@ -4031,7 +4031,7 @@ void CipherBase::Final(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(out.ToBuffer().ToLocalChecked());
 }
 
-Hmac::Hmac(Environment* env, v8::Local<v8::Object> wrap)
+Hmac::Hmac(Environment* env, Local<Object> wrap)
     : BaseObject(env, wrap),
       ctx_(nullptr) {
   MakeWeak();
@@ -4154,7 +4154,7 @@ void Hmac::HmacDigest(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(rc.ToLocalChecked());
 }
 
-Hash::Hash(Environment* env, v8::Local<v8::Object> wrap)
+Hash::Hash(Environment* env, Local<Object> wrap)
     : BaseObject(env, wrap),
       mdctx_(nullptr),
       has_md_(false),
@@ -4402,7 +4402,7 @@ void CheckThrow(Environment* env, SignBase::Error error) {
   }
 }
 
-SignBase::SignBase(Environment* env, v8::Local<v8::Object> wrap)
+SignBase::SignBase(Environment* env, Local<Object> wrap)
     : BaseObject(env, wrap) {
 }
 
@@ -4429,7 +4429,7 @@ static bool ApplyRSAOptions(const ManagedEVPPKey& pkey,
 }
 
 
-Sign::Sign(Environment* env, v8::Local<v8::Object> wrap) : SignBase(env, wrap) {
+Sign::Sign(Environment* env, Local<Object> wrap) : SignBase(env, wrap) {
   MakeWeak();
 }
 
@@ -4752,8 +4752,8 @@ void SignOneShot(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(signature.ToBuffer().ToLocalChecked());
 }
 
-Verify::Verify(Environment* env, v8::Local<v8::Object> wrap) :
-    SignBase(env, wrap) {
+Verify::Verify(Environment* env, Local<Object> wrap)
+  : SignBase(env, wrap) {
   MakeWeak();
 }
 
@@ -5060,7 +5060,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(out.ToBuffer().ToLocalChecked());
 }
 
-DiffieHellman::DiffieHellman(Environment* env, v8::Local<v8::Object> wrap)
+DiffieHellman::DiffieHellman(Environment* env, Local<Object> wrap)
     : BaseObject(env, wrap), verifyError_(0) {
   MakeWeak();
 }
@@ -5423,7 +5423,7 @@ void ECDH::Initialize(Environment* env, Local<Object> target) {
               t->GetFunction(env->context()).ToLocalChecked()).Check();
 }
 
-ECDH::ECDH(Environment* env, v8::Local<v8::Object> wrap, ECKeyPointer&& key)
+ECDH::ECDH(Environment* env, Local<Object> wrap, ECKeyPointer&& key)
     : BaseObject(env, wrap),
     key_(std::move(key)),
     group_(EC_KEY_get0_group(key_.get())) {

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {`
`499`	`499`	`env->set_secure_context_constructor_template(t);`
`500`	`500`	`}`
`501`	`501`
`502`		`-SecureContext::SecureContext(Environment* env, v8::Local<v8::Object> wrap)`
	`502`	`+SecureContext::SecureContext(Environment* env, Local<Object> wrap)`
`503`	`503`	`: BaseObject(env, wrap) {`
`504`	`504`	`MakeWeak();`
`505`	`505`	`env->isolate()->AdjustAmountOfExternalAllocatedMemory(kExternalSize);`
`@@ -3249,7 +3249,7 @@ KeyType KeyObject::GetKeyType() const {`
`3249`	`3249`	`}`
`3250`	`3250`
`3251`	`3251`	`KeyObject::KeyObject(Environment* env,`
`3252`		`- v8::Local<v8::Object> wrap,`
	`3252`	`+ Local<Object> wrap,`
`3253`	`3253`	`KeyType key_type)`
`3254`	`3254`	`: BaseObject(env, wrap),`
`3255`	`3255`	`key_type_(key_type),`
`@@ -3294,7 +3294,7 @@ void KeyObject::Init(const FunctionCallbackInfo<Value>& args) {`
`3294`	`3294`	`}`
`3295`	`3295`	`}`
`3296`	`3296`
`3297`		`-void KeyObject::InitSecret(v8::Local<v8::ArrayBufferView> abv) {`
	`3297`	`+void KeyObject::InitSecret(Local<ArrayBufferView> abv) {`
`3298`	`3298`	`CHECK_EQ(this->key_type_, kKeyTypeSecret);`
`3299`	`3299`
`3300`	`3300`	`size_t key_len = abv->ByteLength();`
`@@ -3356,7 +3356,7 @@ void KeyObject::GetSymmetricKeySize(const FunctionCallbackInfo<Value>& args) {`
`3356`	`3356`	`args.GetReturnValue().Set(static_cast<uint32_t>(key->GetSymmetricKeySize()));`
`3357`	`3357`	`}`
`3358`	`3358`
`3359`		`-void KeyObject::Export(const v8::FunctionCallbackInfo<v8::Value>& args) {`
	`3359`	`+void KeyObject::Export(const FunctionCallbackInfo<Value>& args) {`
`3360`	`3360`	`KeyObject* key;`
`3361`	`3361`	`ASSIGN_OR_RETURN_UNWRAP(&key, args.Holder());`
`3362`	`3362`
`@@ -3400,7 +3400,7 @@ MaybeLocal<Value> KeyObject::ExportPrivateKey(`
`3400`	`3400`	`}`
`3401`	`3401`
`3402`	`3402`	`CipherBase::CipherBase(Environment* env,`
`3403`		`- v8::Local<v8::Object> wrap,`
	`3403`	`+ Local<Object> wrap,`
`3404`	`3404`	`CipherKind kind)`
`3405`	`3405`	`: BaseObject(env, wrap),`
`3406`	`3406`	`ctx_(nullptr),`
`@@ -4031,7 +4031,7 @@ void CipherBase::Final(const FunctionCallbackInfo<Value>& args) {`
`4031`	`4031`	`args.GetReturnValue().Set(out.ToBuffer().ToLocalChecked());`
`4032`	`4032`	`}`
`4033`	`4033`
`4034`		`-Hmac::Hmac(Environment* env, v8::Local<v8::Object> wrap)`
	`4034`	`+Hmac::Hmac(Environment* env, Local<Object> wrap)`
`4035`	`4035`	`: BaseObject(env, wrap),`
`4036`	`4036`	`ctx_(nullptr) {`
`4037`	`4037`	`MakeWeak();`
`@@ -4154,7 +4154,7 @@ void Hmac::HmacDigest(const FunctionCallbackInfo<Value>& args) {`
`4154`	`4154`	`args.GetReturnValue().Set(rc.ToLocalChecked());`
`4155`	`4155`	`}`
`4156`	`4156`
`4157`		`-Hash::Hash(Environment* env, v8::Local<v8::Object> wrap)`
	`4157`	`+Hash::Hash(Environment* env, Local<Object> wrap)`
`4158`	`4158`	`: BaseObject(env, wrap),`
`4159`	`4159`	`mdctx_(nullptr),`
`4160`	`4160`	`has_md_(false),`
`@@ -4402,7 +4402,7 @@ void CheckThrow(Environment* env, SignBase::Error error) {`
`4402`	`4402`	`}`
`4403`	`4403`	`}`
`4404`	`4404`
`4405`		`-SignBase::SignBase(Environment* env, v8::Local<v8::Object> wrap)`
	`4405`	`+SignBase::SignBase(Environment* env, Local<Object> wrap)`
`4406`	`4406`	`: BaseObject(env, wrap) {`
`4407`	`4407`	`}`
`4408`	`4408`
`@@ -4429,7 +4429,7 @@ static bool ApplyRSAOptions(const ManagedEVPPKey& pkey,`
`4429`	`4429`	`}`
`4430`	`4430`
`4431`	`4431`
`4432`		`-Sign::Sign(Environment* env, v8::Local<v8::Object> wrap) : SignBase(env, wrap) {`
	`4432`	`+Sign::Sign(Environment* env, Local<Object> wrap) : SignBase(env, wrap) {`
`4433`	`4433`	`MakeWeak();`
`4434`	`4434`	`}`
`4435`	`4435`
`@@ -4752,8 +4752,8 @@ void SignOneShot(const FunctionCallbackInfo<Value>& args) {`
`4752`	`4752`	`args.GetReturnValue().Set(signature.ToBuffer().ToLocalChecked());`
`4753`	`4753`	`}`
`4754`	`4754`
`4755`		`-Verify::Verify(Environment* env, v8::Local<v8::Object> wrap) :`
`4756`		`- SignBase(env, wrap) {`
	`4755`	`+Verify::Verify(Environment* env, Local<Object> wrap)`
	`4756`	`+ : SignBase(env, wrap) {`
`4757`	`4757`	`MakeWeak();`
`4758`	`4758`	`}`
`4759`	`4759`
`@@ -5060,7 +5060,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {`
`5060`	`5060`	`args.GetReturnValue().Set(out.ToBuffer().ToLocalChecked());`
`5061`	`5061`	`}`
`5062`	`5062`
`5063`		`-DiffieHellman::DiffieHellman(Environment* env, v8::Local<v8::Object> wrap)`
	`5063`	`+DiffieHellman::DiffieHellman(Environment* env, Local<Object> wrap)`
`5064`	`5064`	`: BaseObject(env, wrap), verifyError_(0) {`
`5065`	`5065`	`MakeWeak();`
`5066`	`5066`	`}`
`@@ -5423,7 +5423,7 @@ void ECDH::Initialize(Environment* env, Local<Object> target) {`
`5423`	`5423`	`t->GetFunction(env->context()).ToLocalChecked()).Check();`
`5424`	`5424`	`}`
`5425`	`5425`
`5426`		`-ECDH::ECDH(Environment* env, v8::Local<v8::Object> wrap, ECKeyPointer&& key)`
	`5426`	`+ECDH::ECDH(Environment* env, Local<Object> wrap, ECKeyPointer&& key)`
`5427`	`5427`	`: BaseObject(env, wrap),`
`5428`	`5428`	`key_(std::move(key)),`
`5429`	`5429`	`group_(EC_KEY_get0_group(key_.get())) {`