From 40f39b09cbe7c313137d0997c612eaaaa9ba9207 Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Mon, 7 May 2018 10:24:42 +0200 Subject: [PATCH 1/2] src: rename handle parameter object This commit renames the handle parameter for the BaseObject constructor to object instead of handle. The motivation for doing this is that when stepping through an inheritance chain it can sometimes be a little confusing when HandleWrap is in involved. HandleWrap has a handle parameter but calls the object that is passed to AsyncWrap object, but then when you end up in BaseObject it is named handle. --- src/base_object-inl.h | 10 +++++----- src/base_object.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/base_object-inl.h b/src/base_object-inl.h index 11ba1c88da0486..786e1f26b48256 100644 --- a/src/base_object-inl.h +++ b/src/base_object-inl.h @@ -31,12 +31,12 @@ namespace node { -BaseObject::BaseObject(Environment* env, v8::Local handle) - : persistent_handle_(env->isolate(), handle), +BaseObject::BaseObject(Environment* env, v8::Local object) + : persistent_handle_(env->isolate(), object), env_(env) { - CHECK_EQ(false, handle.IsEmpty()); - CHECK_GT(handle->InternalFieldCount(), 0); - handle->SetAlignedPointerInInternalField(0, static_cast(this)); + CHECK_EQ(false, object.IsEmpty()); + CHECK_GT(object->InternalFieldCount(), 0); + object->SetAlignedPointerInInternalField(0, static_cast(this)); } diff --git a/src/base_object.h b/src/base_object.h index 7d8281238b1c1d..0d9f4494c6d5f1 100644 --- a/src/base_object.h +++ b/src/base_object.h @@ -36,7 +36,7 @@ class BaseObject { public: // Associates this object with `handle`. It uses the 0th internal field for // that, and in particular aborts if there is no such field. - inline BaseObject(Environment* env, v8::Local handle); + inline BaseObject(Environment* env, v8::Local object); virtual inline ~BaseObject(); // Returns the wrapped object. Returns an empty handle when From 2aec8fc66d1861027be42f7e05352836f96b5cac Mon Sep 17 00:00:00 2001 From: Daniel Bevenius Date: Tue, 8 May 2018 03:22:15 +0200 Subject: [PATCH 2/2] squash: update BaseObject constructor comment --- src/base_object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base_object.h b/src/base_object.h index 0d9f4494c6d5f1..2a4967c1aaf303 100644 --- a/src/base_object.h +++ b/src/base_object.h @@ -34,7 +34,7 @@ class Environment; class BaseObject { public: - // Associates this object with `handle`. It uses the 0th internal field for + // Associates this object with `object`. It uses the 0th internal field for // that, and in particular aborts if there is no such field. inline BaseObject(Environment* env, v8::Local object); virtual inline ~BaseObject();