simplify GlobalValueMap calls to DisposeWeak

BUG=

Review URL: https://codereview.chromium.org/1074153002

Cr-Commit-Position: refs/heads/master@{#27750}

diff --git a/include/v8-util.h b/include/v8-util.h
index b01d527..8199016 100644 (file)
--- a/include/v8-util.h
+++ b/include/v8-util.h
@@ -134,9 +134,8 @@ class DefaultGlobalMapTraits : public StdMapTraits<K, V> {
   }
   static void DisposeCallbackData(WeakCallbackInfoType* data) {}
   static void Dispose(Isolate* isolate, Global<V> value, K key) {}
-  static void DisposeWeak(Isolate* isolate,
-                          const WeakCallbackInfo<WeakCallbackInfoType>& data,
-                          K key) {}
+  // This is a second pass callback, so SetSecondPassCallback cannot be called.
+  static void DisposeWeak(const WeakCallbackInfo<WeakCallbackInfoType>& data) {}
 
  private:
   template <typename T>
@@ -453,7 +452,7 @@ class GlobalValueMap : public PersistentValueMapBase<K, V, Traits> {
               : WeakCallbackType::kParameter;
       Local<V> value(Local<V>::New(this->isolate(), *persistent));
       persistent->template SetWeak<typename Traits::WeakCallbackDataType>(
-          Traits::WeakCallbackParameter(this, key, value), WeakCallback,
+          Traits::WeakCallbackParameter(this, key, value), FirstWeakCallback,
           callback_type);
     }
     PersistentContainerValue old_value =
@@ -472,16 +471,20 @@ class GlobalValueMap : public PersistentValueMapBase<K, V, Traits> {
   }
 
  private:
-  static void WeakCallback(
+  static void FirstWeakCallback(
       const WeakCallbackInfo<typename Traits::WeakCallbackDataType>& data) {
     if (Traits::kCallbackType != kNotWeak) {
-      GlobalValueMap<K, V, Traits>* persistentValueMap =
-          Traits::MapFromWeakCallbackInfo(data);
+      auto map = Traits::MapFromWeakCallbackInfo(data);
       K key = Traits::KeyFromWeakCallbackInfo(data);
-      persistentValueMap->RemoveWeak(key);
-      Traits::DisposeWeak(data.GetIsolate(), data, key);
+      map->RemoveWeak(key);
+      data.SetSecondPassCallback(SecondWeakCallback);
     }
   }
+
+  static void SecondWeakCallback(
+      const WeakCallbackInfo<typename Traits::WeakCallbackDataType>& data) {
+    Traits::DisposeWeak(data);
+  }
 };
 
 

diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
index e01e8f1..f7cbb82 100644 (file)
--- a/test/cctest/test-api.cc
+++ b/test/cctest/test-api.cc
@@ -3353,8 +3353,8 @@ class PhantomStdMapTraits : public v8::StdMapTraits<K, V> {
              v8::Object::GetAlignedPointerFromInternalField(value, 0));
   }
   static void DisposeWeak(
-      v8::Isolate* isolate,
-      const v8::WeakCallbackInfo<WeakCallbackDataType>& info, K key) {
+      const v8::WeakCallbackInfo<WeakCallbackDataType>& info) {
+    K key = KeyFromWeakCallbackInfo(info);
     CHECK_EQ(IntKeyToVoidPointer(key), info.GetInternalField(0));
     DisposeCallbackData(info.GetParameter());
   }