| Index: include/v8-util.h
|
| diff --git a/include/v8-util.h b/include/v8-util.h
|
| index e6259c1227b86bc6e83c95c3264d288be313ce77..8133fdd49dcf4fac4e340997e4cac21c7db70806 100644
|
| --- a/include/v8-util.h
|
| +++ b/include/v8-util.h
|
| @@ -95,12 +95,12 @@ class DefaultPersistentValueMapTraits : public StdMapTraits<K, V> {
|
| MapType* map, const K& key, Local<V> value) {
|
| return NULL;
|
| }
|
| - static MapType* MapFromWeakCallbackData(
|
| - const WeakCallbackData<V, WeakCallbackDataType>& data) {
|
| + static MapType* MapFromWeakCallbackInfo(
|
| + const WeakCallbackInfo<WeakCallbackDataType>& data) {
|
| return NULL;
|
| }
|
| - static K KeyFromWeakCallbackData(
|
| - const WeakCallbackData<V, WeakCallbackDataType>& data) {
|
| + static K KeyFromWeakCallbackInfo(
|
| + const WeakCallbackInfo<WeakCallbackDataType>& data) {
|
| return K();
|
| }
|
| static void DisposeCallbackData(WeakCallbackDataType* data) { }
|
| @@ -413,11 +413,11 @@ class PersistentValueMap : public PersistentValueMapBase<K, V, Traits> {
|
|
|
| private:
|
| static void WeakCallback(
|
| - const WeakCallbackData<V, typename Traits::WeakCallbackDataType>& data) {
|
| + const WeakCallbackInfo<typename Traits::WeakCallbackDataType>& data) {
|
| if (Traits::kCallbackType != kNotWeak) {
|
| PersistentValueMap<K, V, Traits>* persistentValueMap =
|
| - Traits::MapFromWeakCallbackData(data);
|
| - K key = Traits::KeyFromWeakCallbackData(data);
|
| + Traits::MapFromWeakCallbackInfo(data);
|
| + K key = Traits::KeyFromWeakCallbackInfo(data);
|
| Traits::Dispose(data.GetIsolate(),
|
| persistentValueMap->Remove(key).Pass(), key);
|
| Traits::DisposeCallbackData(data.GetParameter());
|
|
|