src: replace usage of v8::Handle with v8::Local

v8::Handle is deprecated: https://codereview.chromium.org/1224623004 PR-URL: #2202 Reviewed-By: Ben Noordhuis <[email protected]>
nodejs · Sep 6, 2015 · 4abc896 · 4abc896
1 parent 9a03ae6
commit 4abc896
Show file tree

Hide file tree

Showing 72 changed files with 347 additions and 383 deletions.
diff --git a/benchmark/misc/function_call/binding.cc b/benchmark/misc/function_call/binding.cc
@@ -9,7 +9,7 @@ void Hello(const FunctionCallbackInfo<Value>& args) {
   args.GetReturnValue().Set(c++);
 }
 
-extern "C" void init (Handle<Object> target) {
+extern "C" void init (Local<Object> target) {
   HandleScope scope(Isolate::GetCurrent());
   NODE_SET_METHOD(target, "hello", Hello);
 }

diff --git a/src/async-wrap-inl.h b/src/async-wrap-inl.h
@@ -14,7 +14,7 @@
 namespace node {
 
 inline AsyncWrap::AsyncWrap(Environment* env,
-                            v8::Handle<v8::Object> object,
+                            v8::Local<v8::Object> object,
                             ProviderType provider,
                             AsyncWrap* parent)
     : BaseObject(env, object), bits_(static_cast<uint32_t>(provider) << 1) {
@@ -58,20 +58,20 @@ inline AsyncWrap::ProviderType AsyncWrap::provider_type() const {
 }
 
 
-inline v8::Handle<v8::Value> AsyncWrap::MakeCallback(
-    const v8::Handle<v8::String> symbol,
+inline v8::Local<v8::Value> AsyncWrap::MakeCallback(
+    const v8::Local<v8::String> symbol,
     int argc,
-    v8::Handle<v8::Value>* argv) {
+    v8::Local<v8::Value>* argv) {
   v8::Local<v8::Value> cb_v = object()->Get(symbol);
   CHECK(cb_v->IsFunction());
   return MakeCallback(cb_v.As<v8::Function>(), argc, argv);
 }
 
 
-inline v8::Handle<v8::Value> AsyncWrap::MakeCallback(
+inline v8::Local<v8::Value> AsyncWrap::MakeCallback(
     uint32_t index,
     int argc,
-    v8::Handle<v8::Value>* argv) {
+    v8::Local<v8::Value>* argv) {
   v8::Local<v8::Value> cb_v = object()->Get(index);
   CHECK(cb_v->IsFunction());
   return MakeCallback(cb_v.As<v8::Function>(), argc, argv);

diff --git a/src/async-wrap.cc b/src/async-wrap.cc
@@ -12,7 +12,6 @@ using v8::Array;
 using v8::Context;
 using v8::Function;
 using v8::FunctionCallbackInfo;
-using v8::Handle;
 using v8::HandleScope;
 using v8::HeapProfiler;
 using v8::Integer;
@@ -83,7 +82,7 @@ intptr_t RetainedAsyncInfo::GetSizeInBytes() {
 }
 
 
-RetainedObjectInfo* WrapperInfo(uint16_t class_id, Handle<Value> wrapper) {
+RetainedObjectInfo* WrapperInfo(uint16_t class_id, Local<Value> wrapper) {
   // No class_id should be the provider type of NONE.
   CHECK_NE(NODE_ASYNC_ID_OFFSET, class_id);
   CHECK(wrapper->IsObject());
@@ -129,9 +128,9 @@ static void SetupHooks(const FunctionCallbackInfo<Value>& args) {
 }
 
 
-static void Initialize(Handle<Object> target,
-                Handle<Value> unused,
-                Handle<Context> context) {
+static void Initialize(Local<Object> target,
+                Local<Value> unused,
+                Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
   Isolate* isolate = env->isolate();
   HandleScope scope(isolate);
@@ -160,9 +159,9 @@ void LoadAsyncWrapperInfo(Environment* env) {
 }
 
 
-Handle<Value> AsyncWrap::MakeCallback(const Handle<Function> cb,
+Local<Value> AsyncWrap::MakeCallback(const Local<Function> cb,
                                       int argc,
-                                      Handle<Value>* argv) {
+                                      Local<Value>* argv) {
   CHECK(env()->context() == env()->isolate()->GetCurrentContext());
 
   Local<Object> context = object();

diff --git a/src/async-wrap.h b/src/async-wrap.h
@@ -47,7 +47,7 @@ class AsyncWrap : public BaseObject {
   };
 
   inline AsyncWrap(Environment* env,
-                   v8::Handle<v8::Object> object,
+                   v8::Local<v8::Object> object,
                    ProviderType provider,
                    AsyncWrap* parent = nullptr);
 
@@ -56,15 +56,15 @@ class AsyncWrap : public BaseObject {
   inline ProviderType provider_type() const;
 
   // Only call these within a valid HandleScope.
-  v8::Handle<v8::Value> MakeCallback(const v8::Handle<v8::Function> cb,
+  v8::Local<v8::Value> MakeCallback(const v8::Local<v8::Function> cb,
                                      int argc,
-                                     v8::Handle<v8::Value>* argv);
-  inline v8::Handle<v8::Value> MakeCallback(const v8::Handle<v8::String> symbol,
+                                     v8::Local<v8::Value>* argv);
+  inline v8::Local<v8::Value> MakeCallback(const v8::Local<v8::String> symbol,
                                             int argc,
-                                            v8::Handle<v8::Value>* argv);
-  inline v8::Handle<v8::Value> MakeCallback(uint32_t index,
+                                            v8::Local<v8::Value>* argv);
+  inline v8::Local<v8::Value> MakeCallback(uint32_t index,
                                             int argc,
-                                            v8::Handle<v8::Value>* argv);
+                                            v8::Local<v8::Value>* argv);
 
   virtual size_t self_size() const = 0;
 

diff --git a/src/cares_wrap.cc b/src/cares_wrap.cc
@@ -38,7 +38,6 @@ using v8::EscapableHandleScope;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::Handle;
 using v8::HandleScope;
 using v8::Integer;
 using v8::Local;
@@ -1240,9 +1239,9 @@ static void CaresTimerClose(Environment* env,
 }
 
 
-static void Initialize(Handle<Object> target,
-                       Handle<Value> unused,
-                       Handle<Context> context) {
+static void Initialize(Local<Object> target,
+                       Local<Value> unused,
+                       Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
 
   int r = ares_library_init(ARES_LIB_INIT_ALL);

diff --git a/src/debug-agent.cc b/src/debug-agent.cc
@@ -39,7 +39,6 @@ using v8::Context;
 using v8::Function;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::Handle;
 using v8::HandleScope;
 using v8::Integer;
 using v8::Isolate;

diff --git a/src/fs_event_wrap.cc b/src/fs_event_wrap.cc
@@ -14,7 +14,6 @@ namespace node {
 using v8::Context;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::Handle;
 using v8::HandleScope;
 using v8::Integer;
 using v8::Local;
@@ -24,17 +23,17 @@ using v8::Value;
 
 class FSEventWrap: public HandleWrap {
  public:
-  static void Initialize(Handle<Object> target,
-                         Handle<Value> unused,
-                         Handle<Context> context);
+  static void Initialize(Local<Object> target,
+                         Local<Value> unused,
+                         Local<Context> context);
   static void New(const FunctionCallbackInfo<Value>& args);
   static void Start(const FunctionCallbackInfo<Value>& args);
   static void Close(const FunctionCallbackInfo<Value>& args);
 
   size_t self_size() const override { return sizeof(*this); }
 
  private:
-  FSEventWrap(Environment* env, Handle<Object> object);
+  FSEventWrap(Environment* env, Local<Object> object);
   virtual ~FSEventWrap() override;
 
   static void OnEvent(uv_fs_event_t* handle, const char* filename, int events,
@@ -45,7 +44,7 @@ class FSEventWrap: public HandleWrap {
 };
 
 
-FSEventWrap::FSEventWrap(Environment* env, Handle<Object> object)
+FSEventWrap::FSEventWrap(Environment* env, Local<Object> object)
     : HandleWrap(env,
                  object,
                  reinterpret_cast<uv_handle_t*>(&handle_),
@@ -59,9 +58,9 @@ FSEventWrap::~FSEventWrap() {
 }
 
 
-void FSEventWrap::Initialize(Handle<Object> target,
-                             Handle<Value> unused,
-                             Handle<Context> context) {
+void FSEventWrap::Initialize(Local<Object> target,
+                             Local<Value> unused,
+                             Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
 
   Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
@@ -11,7 +11,6 @@ namespace node {
 
 using v8::Context;
 using v8::FunctionCallbackInfo;
-using v8::Handle;
 using v8::HandleScope;
 using v8::Local;
 using v8::Object;
@@ -59,7 +58,7 @@ void HandleWrap::Close(const FunctionCallbackInfo<Value>& args) {
 
 
 HandleWrap::HandleWrap(Environment* env,
-                       Handle<Object> object,
+                       Local<Object> object,
                        uv_handle_t* handle,
                        AsyncWrap::ProviderType provider,
                        AsyncWrap* parent)

diff --git a/src/handle_wrap.h b/src/handle_wrap.h
@@ -44,7 +44,7 @@ class HandleWrap : public AsyncWrap {
 
  protected:
   HandleWrap(Environment* env,
-             v8::Handle<v8::Object> object,
+             v8::Local<v8::Object> object,
              uv_handle_t* handle,
              AsyncWrap::ProviderType provider,
              AsyncWrap* parent = nullptr);

diff --git a/src/js_stream.cc b/src/js_stream.cc
@@ -15,14 +15,13 @@ using v8::Context;
 using v8::External;
 using v8::FunctionCallbackInfo;
 using v8::FunctionTemplate;
-using v8::Handle;
 using v8::HandleScope;
 using v8::Local;
 using v8::Object;
 using v8::Value;
 
 
-JSStream::JSStream(Environment* env, Handle<Object> obj, AsyncWrap* parent)
+JSStream::JSStream(Environment* env, Local<Object> obj, AsyncWrap* parent)
     : StreamBase(env),
       AsyncWrap(env, obj, AsyncWrap::PROVIDER_JSSTREAM, parent) {
   node::Wrap(obj, this);
@@ -201,9 +200,9 @@ void JSStream::EmitEOF(const FunctionCallbackInfo<Value>& args) {
 }
 
 
-void JSStream::Initialize(Handle<Object> target,
-                          Handle<Value> unused,
-                          Handle<Context> context) {
+void JSStream::Initialize(Local<Object> target,
+                          Local<Value> unused,
+                          Local<Context> context) {
   Environment* env = Environment::GetCurrent(context);
 
   Local<FunctionTemplate> t = env->NewFunctionTemplate(New);

diff --git a/src/js_stream.h b/src/js_stream.h
@@ -10,9 +10,9 @@ namespace node {
 
 class JSStream : public StreamBase, public AsyncWrap {
  public:
-  static void Initialize(v8::Handle<v8::Object> target,
-                         v8::Handle<v8::Value> unused,
-                         v8::Handle<v8::Context> context);
+  static void Initialize(v8::Local<v8::Object> target,
+                         v8::Local<v8::Value> unused,
+                         v8::Local<v8::Context> context);
 
   ~JSStream();
 
@@ -31,7 +31,7 @@ class JSStream : public StreamBase, public AsyncWrap {
   size_t self_size() const override { return sizeof(*this); }
 
  protected:
-  JSStream(Environment* env, v8::Handle<v8::Object> obj, AsyncWrap* parent);
+  JSStream(Environment* env, v8::Local<v8::Object> obj, AsyncWrap* parent);
 
   AsyncWrap* GetAsyncWrap() override;