diff options
author | Fedor Indutny <fedor.indutny@gmail.com> | 2014-02-21 17:02:42 +0400 |
---|---|---|
committer | Fedor Indutny <fedor.indutny@gmail.com> | 2014-02-22 03:20:56 +0400 |
commit | 75adde07f9a2de7f38a67bec72bd377d450bdb52 (patch) | |
tree | f93e9faebbe53c44c6806c9d52ae539a95fe58d5 /src/fs_event_wrap.cc | |
parent | e746bbdc2b79881b2c991c829b5437340583a064 (diff) | |
download | node-new-75adde07f9a2de7f38a67bec72bd377d450bdb52.tar.gz |
src: remove `node_isolate` from source
fix #6899
Diffstat (limited to 'src/fs_event_wrap.cc')
-rw-r--r-- | src/fs_event_wrap.cc | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc index 28b20ac47c..ee28c44afb 100644 --- a/src/fs_event_wrap.cc +++ b/src/fs_event_wrap.cc @@ -81,14 +81,16 @@ FSEventWrap::~FSEventWrap() { void FSEventWrap::Initialize(Handle<Object> target, Handle<Value> unused, Handle<Context> context) { + Environment* env = Environment::GetCurrent(context); + Local<FunctionTemplate> t = FunctionTemplate::New(New); t->InstanceTemplate()->SetInternalFieldCount(1); - t->SetClassName(FIXED_ONE_BYTE_STRING(node_isolate, "FSEvent")); + t->SetClassName(env->fsevent_string()); NODE_SET_PROTOTYPE_METHOD(t, "start", Start); NODE_SET_PROTOTYPE_METHOD(t, "close", Close); - target->Set(FIXED_ONE_BYTE_STRING(node_isolate, "FSEvent"), t->GetFunction()); + target->Set(env->fsevent_string(), t->GetFunction()); } @@ -101,12 +103,13 @@ void FSEventWrap::New(const FunctionCallbackInfo<Value>& args) { void FSEventWrap::Start(const FunctionCallbackInfo<Value>& args) { - HandleScope scope(node_isolate); + Environment* env = Environment::GetCurrent(args.GetIsolate()); + HandleScope scope(env->isolate()); FSEventWrap* wrap = Unwrap<FSEventWrap>(args.This()); if (args.Length() < 1 || !args[0]->IsString()) { - return ThrowTypeError("Bad arguments"); + return env->ThrowTypeError("Bad arguments"); } String::Utf8Value path(args[0]); @@ -158,7 +161,7 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, // unreasonable, right? Still, we should revisit this before v1.0. Local<String> event_string; if (status) { - event_string = String::Empty(node_isolate); + event_string = String::Empty(env->isolate()); } else if (events & UV_RENAME) { event_string = env->rename_string(); } else if (events & UV_CHANGE) { @@ -169,13 +172,13 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, } Local<Value> argv[] = { - Integer::New(status, node_isolate), + Integer::New(status, env->isolate()), event_string, - Null(node_isolate) + Null(env->isolate()) }; if (filename != NULL) { - argv[2] = OneByteString(node_isolate, filename); + argv[2] = OneByteString(env->isolate(), filename); } wrap->MakeCallback(env->onchange_string(), ARRAY_SIZE(argv), argv); @@ -183,7 +186,8 @@ void FSEventWrap::OnEvent(uv_fs_event_t* handle, const char* filename, void FSEventWrap::Close(const FunctionCallbackInfo<Value>& args) { - HandleScope scope(node_isolate); + Environment* env = Environment::GetCurrent(args.GetIsolate()); + HandleScope scope(env->isolate()); FSEventWrap* wrap = Unwrap<FSEventWrap>(args.This()); |