src: upgrade after v8 api change

bnoordhuis · bnoordhuis · commit 393d33e7ea44 · 2013-06-12T00:07:28.000+02:00
The prototype of v8::Persistent&lt;T&gt;::MakeWeak() has changed. Update the
code in src/ to follow suit.
diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h
@@ -115,14 +115,13 @@ class NODE_EXTERN ObjectWrap {
 
  private:
   static void WeakCallback(v8::Isolate* isolate,
-                           v8::Persistent<v8::Value> value,
-                           void* data) {
+                           v8::Persistent<v8::Object>* pobj,
+                           ObjectWrap* wrap) {
     v8::HandleScope scope(isolate);
-    ObjectWrap *obj = static_cast<ObjectWrap*>(data);
-    assert(value == obj->handle_);
-    assert(!obj->refs_);
-    assert(value.IsNearDeath(isolate));
-    delete obj;
+    assert(wrap->refs_ == 0);
+    assert(*pobj == wrap->handle_);
+    assert((*pobj).IsNearDeath(isolate));
+    delete wrap;
   }
 };
 
diff --git a/src/v8_typed_array.cc b/src/v8_typed_array.cc
@@ -69,10 +69,11 @@ class ArrayBuffer {
   }
 
  private:
-  static void WeakCallback(v8::Isolate* env,
-                           v8::Persistent<v8::Value> value,
+  static void WeakCallback(v8::Isolate* isolate,
+                           v8::Persistent<v8::Object>* pobj,
                            void* data) {
-    v8::Object* obj = v8::Object::Cast(*value);
+    v8::HandleScope handle_scope(isolate);
+    v8::Local<v8::Object> obj = v8::Local<v8::Object>::New(*pobj);
 
     void* ptr = obj->GetIndexedPropertiesExternalArrayData();
     int element_size = v8_typed_array::SizeOfArrayElementForType(
@@ -82,8 +83,8 @@ class ArrayBuffer {
 
     node::node_isolate->AdjustAmountOfExternalAllocatedMemory(-size);
 
-    value.ClearWeak(env);
-    value.Dispose(env);
+    (*pobj).ClearWeak(isolate);
+    (*pobj).Dispose(isolate);
 
     free(ptr);
   }
@@ -128,7 +129,9 @@ class ArrayBuffer {
 
     v8::Persistent<v8::Object> persistent =
         v8::Persistent<v8::Object>::New(node::node_isolate, args.This());
-    persistent.MakeWeak(node::node_isolate, NULL, &ArrayBuffer::WeakCallback);
+    persistent.MakeWeak(node::node_isolate,
+                        static_cast<void*>(NULL),
+                        &ArrayBuffer::WeakCallback);
 
     return args.This();
   }
