Use phantom handles instead of weak handles

fpdfsdk/src/javascript/JS_Object.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 70 matching lines @@
 }
 
 void CJS_EmbedObj::EndTimer(CJS_Timer* pTimer)
 {
         ASSERT(pTimer != NULL);
         pTimer->KillJSTimer();
         delete pTimer;
 }
 
 /* ---------------------------------  CJS_Object --------------------------------- */
-void  FreeObject(const v8::WeakCallbackData<v8::Object, CJS_Object>& data)
+void  FreeObject(const v8::WeakCallbackInfo<CJS_Object>& data)
 {
         CJS_Object* pJSObj  = data.GetParameter();
-        if(pJSObj)
-        {
-                pJSObj->ExitInstance();
-                delete pJSObj;
-        }
-        v8::Local<v8::Object> obj = data.GetValue();
-        JS_FreePrivate(obj);
+        pJSObj->ExitInstance();
+        delete pJSObj;
+        JS_FreePrivate(data.GetInternalField(0));
+}
+
+void  DisposeObject(const v8::WeakCallbackInfo<CJS_Object>& data)
+{
+        CJS_Object* pJSObj  = data.GetParameter();
+        pJSObj->Dispose();
+        data.SetSecondPassCallback(FreeObject);
 }
 
 CJS_Object::CJS_Object(JSFXObject pObject) :m_pEmbedObj(NULL)
 {
         v8::Local<v8::Context> context = pObject->CreationContext();
         m_pIsolate = context->GetIsolate();
         m_pObject.Reset(m_pIsolate, pObject);
 };
 
 CJS_Object::~CJS_Object(void)
 {
         delete m_pEmbedObj;
         m_pEmbedObj = NULL;
 
         m_pObject.Reset();
 };
 
 void    CJS_Object::MakeWeak()
 {
-        m_pObject.SetWeak(this, FreeObject);
+        m_pObject.SetWeak(
+            this, DisposeObject, v8::WeakCallbackType::kInternalFields);
+}
+
+void    CJS_Object::Dispose()
+{
+        m_pObject.Reset();
 }
 
 CPDFSDK_PageView* CJS_Object::JSGetPageView(IFXJS_Context* cc)
 {
         return FXJS_GetPageView(cc);
 }
 
 int CJS_Object::MsgBox(CPDFDoc_Environment* pApp, CPDFSDK_PageView* pPageView, FX_LPCWSTR swMsg, FX_LPCWSTR swTitle, FX_UINT nType, FX_UINT nIcon)
 {
         return FXJS_MsgBox(pApp, pPageView, swMsg, swTitle, nType, nIcon);
 }
 
 void CJS_Object::Alert(CJS_Context* pContext, FX_LPCWSTR swMsg)
 {
         ASSERT(pContext != NULL);
 
         if (pContext->IsMsgBoxEnabled())
         {
                 CPDFDoc_Environment* pApp = pContext->GetReaderApp();
                 if(pApp)
                         pApp->JS_appAlert(swMsg, NULL, 0, 3);
         }
 }