Use a new type of weak phantom handle for ScriptWrappable.

third_party/WebKit/Source/bindings/core/v8/ScriptWrappable.h

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 87 matching lines @@
     // to the existing wrapper.
     bool setWrapper(v8::Isolate* isolate, const WrapperTypeInfo* wrapperTypeInfo, v8::Local<v8::Object>& wrapper) WARN_UNUSED_RETURN
     {
         ASSERT(!wrapper.IsEmpty());
         if (UNLIKELY(containsWrapper())) {
             wrapper = newLocalWrapper(isolate);
             return false;
         }
         m_wrapper.Reset(isolate, wrapper);
         wrapperTypeInfo->configureWrapper(&m_wrapper);
-        m_wrapper.SetWeak(this, &firstWeakCallback, v8::WeakCallbackType::kInternalFields);
+        m_wrapper.SetWeak();
         ASSERT(containsWrapper());
         return true;
     }
 
     v8::Local<v8::Object> newLocalWrapper(v8::Isolate* isolate) const
     {
         return v8::Local<v8::Object>::New(isolate, m_wrapper);
     }
 
     bool isEqualTo(const v8::Local<v8::Object>& other) const
@@ skipping 43 matching lines @@
     // With Oilpan we don't need a ScriptWrappable destructor.
     //
     // 'RELEASE_ASSERT_WITH_SECURITY_IMPLICATION(!containsWrapper())' is not needed
     // because Oilpan is not using reference counting at all. If containsWrapper() is true,
     // it means that ScriptWrappable still has a wrapper. In this case, the destructor
     // must not be called since the wrapper has a persistent handle back to this ScriptWrappable object.
     // Assuming that Oilpan's GC is correct (If we cannot assume this, a lot of more things are
     // already broken), we must not hit the RELEASE_ASSERT.
 
 private:
-    void disposeWrapper(const v8::WeakCallbackInfo<ScriptWrappable>& data)
-    {
-        auto scriptWrappable = reinterpret_cast<ScriptWrappable*>(data.GetInternalField(v8DOMWrapperObjectIndex));
-        SECURITY_CHECK(scriptWrappable == this);
-        RELEASE_ASSERT(containsWrapper());
-        m_wrapper.Reset();
-    }
-
-    static void firstWeakCallback(const v8::WeakCallbackInfo<ScriptWrappable>& data)
-    {
-        auto scriptWrappable = data.GetParameter();
-        scriptWrappable->disposeWrapper(data);
-
-        auto wrapperTypeInfo = reinterpret_cast<WrapperTypeInfo*>(data.GetInternalField(v8DOMWrapperTypeIndex));
-        wrapperTypeInfo->wrapperDestroyed();
-    }
-
     v8::Persistent<v8::Object> m_wrapper;
 };
 
 // Defines 'wrapperTypeInfo' virtual method which returns the WrapperTypeInfo of
 // the instance. Also declares a static member of type WrapperTypeInfo, of which
 // the definition is given by the IDL code generator.
 //
 // All the derived classes of ScriptWrappable, regardless of directly or
 // indirectly, must write this macro in the class definition as long as the
 // class has a corresponding .idl file.
@@ skipping 18 matching lines @@
 // in X's cpp code, and instantiate X, i.e. "template class X;".
 #define DECLARE_WRAPPERTYPEINFO() \
 public: \
     const WrapperTypeInfo* wrapperTypeInfo() const override; \
 private: \
     typedef void end_of_define_wrappertypeinfo_not_reached_t
 
 } // namespace blink
 
 #endif // ScriptWrappable_h