GeezerVison

The World Wide Web, restored to 800 pixels of glory.

GeezerVison is showing github.com — src: refactor BaseObject methods · nodejs/node@2d2e71c

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

Expand file treeCollapse file tree

Open diff view settings

Collapse file

`‎src/base_object-inl.h‎`

Copy file name to clipboardExpand all lines: src/base_object-inl.h

+12-2Lines changed: 12 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -73,14 +73,24 @@ Realm* BaseObject::realm() const {`
`73`	`73`	`return realm_;`
`74`	`74`	`}`
`75`	`75`
	`76`	`+void BaseObject::TagNodeObject(v8::Local<v8::Object> object) {`
	`77`	`+ DCHECK_GE(object->InternalFieldCount(), BaseObject::kInternalFieldCount);`
	`78`	`+ object->SetAlignedPointerInInternalField(BaseObject::kEmbedderType,`
	`79`	`+ &kNodeEmbedderId);`
	`80`	`+}`
	`81`	`+`
	`82`	`+void BaseObject::SetInternalFields(v8::Local<v8::Object> object, void* slot) {`
	`83`	`+ TagNodeObject(object);`
	`84`	`+ object->SetAlignedPointerInInternalField(BaseObject::kSlot, slot);`
	`85`	`+}`
	`86`	`+`
`76`	`87`	`BaseObject* BaseObject::FromJSObject(v8::Local<v8::Value> value) {`
`77`	`88`	`v8::Local<v8::Object> obj = value.As<v8::Object>();`
`78`		`- DCHECK_GE(obj->InternalFieldCount(), BaseObject::kSlot);`
	`89`	`+ DCHECK_GE(obj->InternalFieldCount(), BaseObject::kInternalFieldCount);`
`79`	`90`	`return static_cast<BaseObject*>(`
`80`	`91`	`obj->GetAlignedPointerFromInternalField(BaseObject::kSlot));`
`81`	`92`	`}`
`82`	`93`
`83`		`-`
`84`	`94`	`template <typename T>`
`85`	`95`	`T* BaseObject::FromJSObject(v8::Local<v8::Value> object) {`
`86`	`96`	`return static_cast<T*>(FromJSObject(object));`

Collapse file

`‎src/base_object.cc‎`

Copy file name to clipboardExpand all lines: src/base_object.cc

+9-9Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,7 @@ BaseObject::BaseObject(Realm* realm, Local<Object> object)`
`17`	`17`	`: persistent_handle_(realm->isolate(), object), realm_(realm) {`
`18`	`18`	`CHECK_EQ(false, object.IsEmpty());`
`19`	`19`	`CHECK_GE(object->InternalFieldCount(), BaseObject::kInternalFieldCount);`
`20`		`- object->SetAlignedPointerInInternalField(BaseObject::kEmbedderType,`
`21`		`- &kNodeEmbedderId);`
`22`		`- object->SetAlignedPointerInInternalField(BaseObject::kSlot,`
`23`		`- static_cast<void*>(this));`
	`20`	`+ SetInternalFields(object, static_cast<void*>(this));`
`24`	`21`	`realm->AddCleanupHook(DeleteMe, static_cast<void*>(this));`
`25`	`22`	`realm->modify_base_object_count(1);`
`26`	`23`	`}`
`@@ -80,16 +77,19 @@ void BaseObject::LazilyInitializedJSTemplateConstructor(`
`80`	`77`	`const FunctionCallbackInfo<Value>& args) {`
`81`	`78`	`DCHECK(args.IsConstructCall());`
`82`	`79`	`CHECK_GE(args.This()->InternalFieldCount(), BaseObject::kInternalFieldCount);`
`83`		`- args.This()->SetAlignedPointerInInternalField(BaseObject::kEmbedderType,`
`84`		`- &kNodeEmbedderId);`
`85`		`- args.This()->SetAlignedPointerInInternalField(BaseObject::kSlot, nullptr);`
	`80`	`+ SetInternalFields(args.This(), nullptr);`
`86`	`81`	`}`
`87`	`82`
`88`	`83`	`Local<FunctionTemplate> BaseObject::MakeLazilyInitializedJSTemplate(`
`89`	`84`	`Environment* env) {`
	`85`	`+ return MakeLazilyInitializedJSTemplate(env->isolate_data());`
	`86`	`+}`
	`87`	`+`
	`88`	`+Local<FunctionTemplate> BaseObject::MakeLazilyInitializedJSTemplate(`
	`89`	`+ IsolateData* isolate_data) {`
`90`	`90`	`Local<FunctionTemplate> t = NewFunctionTemplate(`
`91`		`- env->isolate(), LazilyInitializedJSTemplateConstructor);`
`92`		`- t->Inherit(BaseObject::GetConstructorTemplate(env));`
	`91`	`+ isolate_data->isolate(), LazilyInitializedJSTemplateConstructor);`
	`92`	`+ t->Inherit(BaseObject::GetConstructorTemplate(isolate_data));`
`93`	`93`	`t->InstanceTemplate()->SetInternalFieldCount(BaseObject::kInternalFieldCount);`
`94`	`94`	`return t;`
`95`	`95`	`}`

Collapse file

`‎src/base_object.h‎`

Copy file name to clipboardExpand all lines: src/base_object.h

+5-1Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,9 @@ class BaseObject : public MemoryRetainer {`
`73`	`73`	// was also passed to the `BaseObject()` constructor initially.
`74`	`74`	// This may return `nullptr` if the C++ object has not been constructed yet,
`75`	`75`	// e.g. when the JS object used `MakeLazilyInitializedJSTemplate`.
	`76`	`+ static inline void SetInternalFields(v8::Local<v8::Object> object,`
	`77`	`+ void* slot);`
	`78`	`+ static inline void TagNodeObject(v8::Local<v8::Object> object);`
`76`	`79`	`static void LazilyInitializedJSTemplateConstructor(`
`77`	`80`	`const v8::FunctionCallbackInfo<v8::Value>& args);`
`78`	`81`	`static inline BaseObject* FromJSObject(v8::Local<v8::Value> object);`
`@@ -98,7 +101,8 @@ class BaseObject : public MemoryRetainer {`
`98`	`101`	`// Utility to create a FunctionTemplate with one internal field (used for`
`99`	`102`	// the `BaseObject*` pointer) and a constructor that initializes that field
`100`	`103`	// to `nullptr`.
`101`		`- // TODO(legendecas): Disentangle template with env.`
	`104`	`+ static v8::Local<v8::FunctionTemplate> MakeLazilyInitializedJSTemplate(`
	`105`	`+ IsolateData* isolate);`
`102`	`106`	`static v8::Local<v8::FunctionTemplate> MakeLazilyInitializedJSTemplate(`
`103`	`107`	`Environment* env);`
`104`	`108`

0 commit comments

Comments

0 (0)

You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.