Index: runtime/vm/dart_api_state.h |
=================================================================== |
--- runtime/vm/dart_api_state.h (revision 22905) |
+++ runtime/vm/dart_api_state.h (working copy) |
@@ -187,7 +187,7 @@ |
if (callback != NULL) { |
void* peer = handle->peer(); |
handle->Clear(); |
- (*callback)(reinterpret_cast<Dart_Handle>(handle), peer); |
+ (*callback)(reinterpret_cast<Dart_WeakPersistentHandle>(handle), peer); |
} else { |
handle->Clear(); |
} |
@@ -351,7 +351,7 @@ |
} |
// Validate if passed in handle is a Persistent Handle. |
- bool IsValidHandle(Dart_Handle object) const { |
+ bool IsValidHandle(Dart_PersistentHandle object) const { |
return IsValidScopedHandle(reinterpret_cast<uword>(object)); |
} |
@@ -425,7 +425,7 @@ |
} |
// Validate if passed in handle is a Persistent Handle. |
- bool IsValidHandle(Dart_Handle object) const { |
+ bool IsValidHandle(Dart_WeakPersistentHandle object) const { |
return IsValidScopedHandle(reinterpret_cast<uword>(object)); |
} |
@@ -456,14 +456,14 @@ |
RawObject** get_key(intptr_t i) { |
ASSERT(i >= 0); |
ASSERT(i < num_keys_); |
- return (reinterpret_cast<PersistentHandle*>(keys_[i]))->raw_addr(); |
+ return (reinterpret_cast<FinalizablePersistentHandle*>(keys_[i]))->raw_addr(); |
} |
intptr_t num_values() const { return num_values_; } |
RawObject** get_value(intptr_t i) { |
ASSERT(i >= 0); |
ASSERT(i < num_values_); |
- return (reinterpret_cast<PersistentHandle*>(values_[i]))->raw_addr(); |
+ return (reinterpret_cast<FinalizablePersistentHandle*>(values_[i]))->raw_addr(); |
} |
static WeakReferenceSet* Pop(WeakReferenceSet** queue) { |
@@ -617,15 +617,15 @@ |
return false; |
} |
- bool IsValidPersistentHandle(Dart_Handle object) const { |
+ bool IsValidPersistentHandle(Dart_PersistentHandle object) const { |
return persistent_handles_.IsValidHandle(object); |
} |
- bool IsValidWeakPersistentHandle(Dart_Handle object) const { |
+ bool IsValidWeakPersistentHandle(Dart_WeakPersistentHandle object) const { |
return weak_persistent_handles_.IsValidHandle(object); |
} |
- bool IsValidPrologueWeakPersistentHandle(Dart_Handle object) const { |
+ bool IsValidPrologueWeakPersistentHandle(Dart_WeakPersistentHandle object) const { |
return prologue_weak_persistent_handles_.IsValidHandle(object); |
} |