Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

napi: break dep between v8 and napi attributes #12191

Closed
wants to merge 3 commits into from
Closed

napi: break dep between v8 and napi attributes #12191

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2315a9
n-api: break dep between v8 and napi attributes
mhdawson Apr 3, 2017
444b519
squash: address comments
mhdawson Apr 4, 2017
fbcc3c6
squash: address suggestion
mhdawson Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions src/node_api.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,22 @@ napi_env JsEnvFromV8Isolate(v8::Isolate* isolate) {
return reinterpret_cast<napi_env>(isolate);
}

// convert from n-api property attributes to v8::PropertyAttribute
static inline v8::PropertyAttribute V8PropertyAttributesFromAttributes(
napi_property_attributes attributes) {
unsigned int attribute_flags = v8::None;
if (attributes & napi_read_only) {
attribute_flags |= v8::ReadOnly;
}
if (attributes & napi_dont_enum) {
attribute_flags |= v8::DontEnum;
}
if (attributes & napi_dont_delete) {
attribute_flags |= v8::DontDelete;
}
return static_cast<v8::PropertyAttribute>(attribute_flags);
}

v8::Isolate* V8IsolateFromJsEnv(napi_env e) {
return reinterpret_cast<v8::Isolate*>(e);
}
Expand Down Expand Up @@ -740,9 +756,8 @@ napi_status napi_define_class(napi_env env,

v8::Local<v8::String> property_name;
CHECK_NEW_FROM_UTF8(isolate, property_name, p->utf8name);

v8::PropertyAttribute attributes =
static_cast<v8::PropertyAttribute>(p->attributes);
v8impl::V8PropertyAttributesFromAttributes(p->attributes);

// This code is similar to that in napi_define_property(); the
// difference is it applies to a template instead of an object.
Expand Down Expand Up @@ -1051,8 +1066,9 @@ napi_status napi_define_properties(napi_env env,
v8::Local<v8::Name> name;
CHECK_NEW_FROM_UTF8(isolate, name, p->utf8name);

v8::PropertyAttribute attributes = static_cast<v8::PropertyAttribute>(
p->attributes & ~napi_static_property);
v8::PropertyAttribute attributes =
v8impl::V8PropertyAttributesFromAttributes(
(napi_property_attributes)(p->attributes & ~napi_static_property));

if (p->method) {
v8::Local<v8::Object> cbdata =
Expand Down