Skip to content

Commit

Permalink
src: rename handle parameter object
Browse files Browse the repository at this point in the history
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.

PR-URL: nodejs#20570
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
danbev committed May 9, 2018
1 parent d5b259e commit 36793b8
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
10 changes: 5 additions & 5 deletions src/base_object-inl.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@

namespace node {

BaseObject::BaseObject(Environment* env, v8::Local<v8::Object> handle)
: persistent_handle_(env->isolate(), handle),
BaseObject::BaseObject(Environment* env, v8::Local<v8::Object> object)
: persistent_handle_(env->isolate(), object),
env_(env) {
CHECK_EQ(false, handle.IsEmpty());
CHECK_GT(handle->InternalFieldCount(), 0);
handle->SetAlignedPointerInInternalField(0, static_cast<void*>(this));
CHECK_EQ(false, object.IsEmpty());
CHECK_GT(object->InternalFieldCount(), 0);
object->SetAlignedPointerInInternalField(0, static_cast<void*>(this));
}


Expand Down
4 changes: 2 additions & 2 deletions src/base_object.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ 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<v8::Object> handle);
inline BaseObject(Environment* env, v8::Local<v8::Object> object);
virtual inline ~BaseObject();

// Returns the wrapped object. Returns an empty handle when
Expand Down

0 comments on commit 36793b8

Please sign in to comment.