src: remove excess v8 namespace

himself65 · addaleax · commit 1de9718b54f6 · 2020-03-30T19:18:05.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
@@ -520,7 +520,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);
@@ -3305,7 +3305,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),
@@ -3350,7 +3350,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();
@@ -3414,7 +3414,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());
 
@@ -3458,7 +3458,7 @@ MaybeLocal<Value> KeyObject::ExportPrivateKey(
 }
 
 CipherBase::CipherBase(Environment* env,
-                       v8::Local<v8::Object> wrap,
+                       Local<Object> wrap,
                        CipherKind kind)
     : BaseObject(env, wrap),
       ctx_(nullptr),
@@ -4077,7 +4077,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();
@@ -4187,7 +4187,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),
@@ -4420,7 +4420,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) {
 }
 
@@ -4447,7 +4447,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();
 }
 
@@ -4768,8 +4768,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();
 }
 
@@ -5075,7 +5075,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();
 }
@@ -5441,7 +5441,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
`@@ -520,7 +520,7 @@ void SecureContext::Initialize(Environment* env, Local<Object> target) {`
`520`	`520`	`env->set_secure_context_constructor_template(t);`
`521`	`521`	`}`
`522`	`522`
`523`		`-SecureContext::SecureContext(Environment* env, v8::Local<v8::Object> wrap)`
	`523`	`+SecureContext::SecureContext(Environment* env, Local<Object> wrap)`
`524`	`524`	`: BaseObject(env, wrap) {`
`525`	`525`	`MakeWeak();`
`526`	`526`	`env->isolate()->AdjustAmountOfExternalAllocatedMemory(kExternalSize);`
`@@ -3305,7 +3305,7 @@ KeyType KeyObject::GetKeyType() const {`
`3305`	`3305`	`}`
`3306`	`3306`
`3307`	`3307`	`KeyObject::KeyObject(Environment* env,`
`3308`		`- v8::Local<v8::Object> wrap,`
	`3308`	`+ Local<Object> wrap,`
`3309`	`3309`	`KeyType key_type)`
`3310`	`3310`	`: BaseObject(env, wrap),`
`3311`	`3311`	`key_type_(key_type),`
`@@ -3350,7 +3350,7 @@ void KeyObject::Init(const FunctionCallbackInfo<Value>& args) {`
`3350`	`3350`	`}`
`3351`	`3351`	`}`
`3352`	`3352`
`3353`		`-void KeyObject::InitSecret(v8::Local<v8::ArrayBufferView> abv) {`
	`3353`	`+void KeyObject::InitSecret(Local<ArrayBufferView> abv) {`
`3354`	`3354`	`CHECK_EQ(this->key_type_, kKeyTypeSecret);`
`3355`	`3355`
`3356`	`3356`	`size_t key_len = abv->ByteLength();`
`@@ -3414,7 +3414,7 @@ void KeyObject::GetSymmetricKeySize(const FunctionCallbackInfo<Value>& args) {`
`3414`	`3414`	`args.GetReturnValue().Set(static_cast<uint32_t>(key->GetSymmetricKeySize()));`
`3415`	`3415`	`}`
`3416`	`3416`
`3417`		`-void KeyObject::Export(const v8::FunctionCallbackInfo<v8::Value>& args) {`
	`3417`	`+void KeyObject::Export(const FunctionCallbackInfo<Value>& args) {`
`3418`	`3418`	`KeyObject* key;`
`3419`	`3419`	`ASSIGN_OR_RETURN_UNWRAP(&key, args.Holder());`
`3420`	`3420`
`@@ -3458,7 +3458,7 @@ MaybeLocal<Value> KeyObject::ExportPrivateKey(`
`3458`	`3458`	`}`
`3459`	`3459`
`3460`	`3460`	`CipherBase::CipherBase(Environment* env,`
`3461`		`- v8::Local<v8::Object> wrap,`
	`3461`	`+ Local<Object> wrap,`
`3462`	`3462`	`CipherKind kind)`
`3463`	`3463`	`: BaseObject(env, wrap),`
`3464`	`3464`	`ctx_(nullptr),`
`@@ -4077,7 +4077,7 @@ void CipherBase::Final(const FunctionCallbackInfo<Value>& args) {`
`4077`	`4077`	`args.GetReturnValue().Set(out.ToBuffer().ToLocalChecked());`
`4078`	`4078`	`}`
`4079`	`4079`
`4080`		`-Hmac::Hmac(Environment* env, v8::Local<v8::Object> wrap)`
	`4080`	`+Hmac::Hmac(Environment* env, Local<Object> wrap)`
`4081`	`4081`	`: BaseObject(env, wrap),`
`4082`	`4082`	`ctx_(nullptr) {`
`4083`	`4083`	`MakeWeak();`
`@@ -4187,7 +4187,7 @@ void Hmac::HmacDigest(const FunctionCallbackInfo<Value>& args) {`
`4187`	`4187`	`args.GetReturnValue().Set(rc.ToLocalChecked());`
`4188`	`4188`	`}`
`4189`	`4189`
`4190`		`-Hash::Hash(Environment* env, v8::Local<v8::Object> wrap)`
	`4190`	`+Hash::Hash(Environment* env, Local<Object> wrap)`
`4191`	`4191`	`: BaseObject(env, wrap),`
`4192`	`4192`	`mdctx_(nullptr),`
`4193`	`4193`	`has_md_(false),`
`@@ -4420,7 +4420,7 @@ void CheckThrow(Environment* env, SignBase::Error error) {`
`4420`	`4420`	`}`
`4421`	`4421`	`}`
`4422`	`4422`
`4423`		`-SignBase::SignBase(Environment* env, v8::Local<v8::Object> wrap)`
	`4423`	`+SignBase::SignBase(Environment* env, Local<Object> wrap)`
`4424`	`4424`	`: BaseObject(env, wrap) {`
`4425`	`4425`	`}`
`4426`	`4426`
`@@ -4447,7 +4447,7 @@ static bool ApplyRSAOptions(const ManagedEVPPKey& pkey,`
`4447`	`4447`	`}`
`4448`	`4448`
`4449`	`4449`
`4450`		`-Sign::Sign(Environment* env, v8::Local<v8::Object> wrap) : SignBase(env, wrap) {`
	`4450`	`+Sign::Sign(Environment* env, Local<Object> wrap) : SignBase(env, wrap) {`
`4451`	`4451`	`MakeWeak();`
`4452`	`4452`	`}`
`4453`	`4453`
`@@ -4768,8 +4768,8 @@ void SignOneShot(const FunctionCallbackInfo<Value>& args) {`
`4768`	`4768`	`args.GetReturnValue().Set(signature.ToBuffer().ToLocalChecked());`
`4769`	`4769`	`}`
`4770`	`4770`
`4771`		`-Verify::Verify(Environment* env, v8::Local<v8::Object> wrap) :`
`4772`		`- SignBase(env, wrap) {`
	`4771`	`+Verify::Verify(Environment* env, Local<Object> wrap)`
	`4772`	`+ : SignBase(env, wrap) {`
`4773`	`4773`	`MakeWeak();`
`4774`	`4774`	`}`
`4775`	`4775`
`@@ -5075,7 +5075,7 @@ void PublicKeyCipher::Cipher(const FunctionCallbackInfo<Value>& args) {`
`5075`	`5075`	`args.GetReturnValue().Set(out.ToBuffer().ToLocalChecked());`
`5076`	`5076`	`}`
`5077`	`5077`
`5078`		`-DiffieHellman::DiffieHellman(Environment* env, v8::Local<v8::Object> wrap)`
	`5078`	`+DiffieHellman::DiffieHellman(Environment* env, Local<Object> wrap)`
`5079`	`5079`	`: BaseObject(env, wrap), verifyError_(0) {`
`5080`	`5080`	`MakeWeak();`
`5081`	`5081`	`}`
`@@ -5441,7 +5441,7 @@ void ECDH::Initialize(Environment* env, Local<Object> target) {`
`5441`	`5441`	`t->GetFunction(env->context()).ToLocalChecked()).Check();`
`5442`	`5442`	`}`
`5443`	`5443`
`5444`		`-ECDH::ECDH(Environment* env, v8::Local<v8::Object> wrap, ECKeyPointer&& key)`
	`5444`	`+ECDH::ECDH(Environment* env, Local<Object> wrap, ECKeyPointer&& key)`
`5445`	`5445`	`: BaseObject(env, wrap),`
`5446`	`5446`	`key_(std::move(key)),`
`5447`	`5447`	`group_(EC_KEY_get0_group(key_.get())) {`