Index: include/v8.h |
diff --git a/include/v8.h b/include/v8.h |
index 7d55936ae12d2f617cdbb00e3aeacfd9ae57615c..335d181d9114e52c848d7aeb42bd4d4246f94900 100644 |
--- a/include/v8.h |
+++ b/include/v8.h |
@@ -214,11 +214,6 @@ class WeakReferenceCallbacks { |
P* parameter); |
}; |
-// TODO(svenpanne) Temporary definition until Chrome is in sync. |
-typedef void (*NearDeathCallback)(Isolate* isolate, |
- Persistent<Value> object, |
- void* parameter); |
- |
// --- Handles --- |
#define TYPE_CHECK(T, S) \ |
@@ -676,11 +671,6 @@ template <class T> class Persistent // NOLINT |
MakeWeak<P>(parameters, callback); |
} |
- // TODO(dcarney): remove before cutover |
- V8_INLINE(void MakeWeak(Isolate* isolate, |
- void* parameters, |
- NearDeathCallback callback)); |
- |
V8_INLINE(void ClearWeak()); |
// TODO(dcarney): deprecate |
@@ -4605,8 +4595,7 @@ class V8EXPORT V8 { |
typedef WeakReferenceCallbacks<Value, void>::Revivable RevivableCallback; |
static void MakeWeak(internal::Object** global_handle, |
void* data, |
- RevivableCallback weak_reference_callback, |
- NearDeathCallback near_death_callback); |
+ RevivableCallback weak_reference_callback); |
static void ClearWeak(internal::Object** global_handle); |
template <class T> friend class Handle; |
@@ -5540,8 +5529,7 @@ void Persistent<T>::MakeWeak( |
typedef typename WeakReferenceCallbacks<Value, void>::Revivable Revivable; |
V8::MakeWeak(reinterpret_cast<internal::Object**>(this->val_), |
parameters, |
- reinterpret_cast<Revivable>(callback), |
- NULL); |
+ reinterpret_cast<Revivable>(callback)); |
} |
@@ -5555,17 +5543,6 @@ void Persistent<T>::MakeWeak( |
template <class T> |
-void Persistent<T>::MakeWeak(Isolate* isolate, |
- void* parameters, |
- NearDeathCallback callback) { |
- V8::MakeWeak(reinterpret_cast<internal::Object**>(this->val_), |
- parameters, |
- NULL, |
- callback); |
-} |
- |
- |
-template <class T> |
void Persistent<T>::ClearWeak() { |
V8::ClearWeak(reinterpret_cast<internal::Object**>(this->val_)); |
} |