Remove backpointer to CJS_Runtime from CJS_Value

fpdfsdk/javascript/Document.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 "fpdfsdk/javascript/Document.h"
 
 #include <vector>
 
@@ skipping 183 matching lines @@
     else
       m_pDocument->ClearChangeMark();
   }
 
   return TRUE;
 }
 
 FX_BOOL Document::ADBE(IJS_Context* cc,
                        CJS_PropValue& vp,
                        CFX_WideString& sError) {
-  if (vp.IsGetting()) {
-    vp.SetNull();
-  } else {
-  }
+  if (vp.IsGetting())
+    vp.GetJSValue()->SetNull(CJS_Runtime::FromContext(cc));
 
   return TRUE;
 }
 
 FX_BOOL Document::pageNum(IJS_Context* cc,
                           CJS_PropValue& vp,
                           CFX_WideString& sError) {
   if (vp.IsGetting()) {
     if (CPDFSDK_PageView* pPageView = m_pDocument->GetCurrentView()) {
       vp << pPageView->GetPageIndex();
@@ skipping 58 matching lines @@
 
 // Maps a field object in PDF document to a JavaScript variable
 // comment:
 // note: the paremter cName, this is clue how to treat if the cName is not a
 // valiable filed name in this document
 
 FX_BOOL Document::getField(IJS_Context* cc,
                            const std::vector<CJS_Value>& params,
                            CJS_Value& vRet,
                            CFX_WideString& sError) {
-  CJS_Context* pContext = (CJS_Context*)cc;
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:33]

Move 285 and 286 down to 293 where they're first needed?

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   if (params.size() < 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  CFX_WideString wideName = params[0].ToCFXWideString();
+  CFX_WideString wideName = params[0].ToCFXWideString(pIsolate);
 
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
   if (pPDFForm->CountFields(wideName) <= 0) {
-    vRet.SetNull();
+    vRet.SetNull(pRuntime);
     return TRUE;
   }
 
-  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-  v8::Local<v8::Object> pFieldObj = FXJS_NewFxDynamicObj(
-      pRuntime->GetIsolate(), pRuntime, CJS_Field::g_nObjDefnID);
+  v8::Local<v8::Object> pFieldObj =
+      FXJS_NewFxDynamicObj(pIsolate, pRuntime, CJS_Field::g_nObjDefnID);

[dsinclair, 2016/08/09 19:25:32]

Does this always take the isolate from the runtime? Or, can the isolate differ
from pRuntime->GetIsolate() in other calls? If it doesn't differ, can we just
remove the isolate param?

[Tom Sepez, 2016/08/09 20:33:23]

That's a follow-on.  Ideally, there'd be a CFXJS_Runtime from which CJS_Runtime
inherits.  Then this call becomes 

foo = pRuntime->NewFxDynamicObject(id);

 
-  v8::Isolate* isolate = GetIsolate(cc);
-  CJS_Field* pJSField = (CJS_Field*)FXJS_GetPrivate(isolate, pFieldObj);
+  CJS_Field* pJSField = (CJS_Field*)FXJS_GetPrivate(pIsolate, pFieldObj);

[dsinclair, 2016/08/09 19:25:32]

static_cast

[Tom Sepez, 2016/08/09 20:33:24]

Done.

   Field* pField = (Field*)pJSField->GetEmbedObject();

[dsinclair, 2016/08/09 19:25:32]

static_cast

[Tom Sepez, 2016/08/09 20:33:24]

Done.

   pField->AttachField(this, wideName);
 
-  vRet = pJSField;
+  vRet = CJS_Value(pRuntime, pJSField);
   return TRUE;
 }
 
 // Gets the name of the nth field in the document
 FX_BOOL Document::getNthFieldName(IJS_Context* cc,
                                   const std::vector<CJS_Value>& params,
                                   CJS_Value& vRet,
                                   CFX_WideString& sError) {
-  CJS_Context* pContext = (CJS_Context*)cc;
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:32]

Down to 327?

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   if (params.size() != 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  int nIndex = params[0].ToInt();
+  int nIndex = params[0].ToInt(pIsolate);
   if (nIndex < 0) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
   CPDF_FormField* pField = pPDFForm->GetField(nIndex);
   if (!pField)
     return FALSE;
 
-  vRet = pField->GetFullName().c_str();
+  vRet = CJS_Value(pRuntime, pField->GetFullName().c_str());
   return TRUE;
 }
 
 FX_BOOL Document::importAnFDF(IJS_Context* cc,
                               const std::vector<CJS_Value>& params,
                               CJS_Value& vRet,
                               CFX_WideString& sError) {
   // Unsafe, not supported.
   return TRUE;
 }
@@ skipping 18 matching lines @@
 // all recipients.
 // comment: need reader supports
 // note:
 // int CPDFSDK_Document::mailForm(FX_BOOL bUI,String cto,string ccc,string
 // cbcc,string cSubject,string cms);
 
 FX_BOOL Document::mailForm(IJS_Context* cc,
                            const std::vector<CJS_Value>& params,
                            CJS_Value& vRet,
                            CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  v8::Isolate* pIsolate = pRuntime->GetIsolate();

[dsinclair, 2016/08/09 19:25:32]

Down to 387

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+
   if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
     return FALSE;
 
   int iLength = params.size();
 
-  FX_BOOL bUI = iLength > 0 ? params[0].ToBool() : TRUE;
-  CFX_WideString cTo = iLength > 1 ? params[1].ToCFXWideString() : L"";
-  CFX_WideString cCc = iLength > 2 ? params[2].ToCFXWideString() : L"";
-  CFX_WideString cBcc = iLength > 3 ? params[3].ToCFXWideString() : L"";
-  CFX_WideString cSubject = iLength > 4 ? params[4].ToCFXWideString() : L"";
-  CFX_WideString cMsg = iLength > 5 ? params[5].ToCFXWideString() : L"";
+  FX_BOOL bUI = iLength > 0 ? params[0].ToBool(pIsolate) : TRUE;
+  CFX_WideString cTo = iLength > 1 ? params[1].ToCFXWideString(pIsolate) : L"";
+  CFX_WideString cCc = iLength > 2 ? params[2].ToCFXWideString(pIsolate) : L"";
+  CFX_WideString cBcc = iLength > 3 ? params[3].ToCFXWideString(pIsolate) : L"";
+  CFX_WideString cSubject =
+      iLength > 4 ? params[4].ToCFXWideString(pIsolate) : L"";
+  CFX_WideString cMsg = iLength > 5 ? params[5].ToCFXWideString(pIsolate) : L"";
 
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   CFX_ByteTextBuf textBuf;
   if (!pInterForm->ExportFormToFDFTextBuf(textBuf))
     return FALSE;
 
-  CJS_Context* pContext = (CJS_Context*)cc;
+  pRuntime->BeginBlock();
   CPDFDoc_Environment* pEnv = pContext->GetReaderApp();

[dsinclair, 2016/08/09 19:25:32]

This was outside the Begin/End block previously, not sure the ramifications,
does it matter?

[Tom Sepez, 2016/08/09 20:33:23]

Nope, it just guards against re-entrancy in the embedder callbacks.  If we're
not going to make the call, nothing to guard.

-  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-
-  pRuntime->BeginBlock();
   pEnv->JS_docmailForm(textBuf.GetBuffer(), textBuf.GetLength(), bUI,
                        cTo.c_str(), cSubject.c_str(), cCc.c_str(), cBcc.c_str(),
                        cMsg.c_str());
   pRuntime->EndBlock();
   return TRUE;
 }
 
 FX_BOOL Document::print(IJS_Context* cc,
                         const std::vector<CJS_Value>& params,
                         CJS_Value& vRet,
                         CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   FX_BOOL bUI = TRUE;
   int nStart = 0;
   int nEnd = 0;
   FX_BOOL bSilent = FALSE;
   FX_BOOL bShrinkToFit = FALSE;
   FX_BOOL bPrintAsImage = FALSE;
   FX_BOOL bReverse = FALSE;
   FX_BOOL bAnnotations = FALSE;
 
   int nlength = params.size();
   if (nlength == 9) {
     if (params[8].GetType() == CJS_Value::VT_object) {
-      v8::Local<v8::Object> pObj = params[8].ToV8Object();
+      v8::Local<v8::Object> pObj = params[8].ToV8Object(pIsolate);
       if (FXJS_GetObjDefnID(pObj) == CJS_PrintParamsObj::g_nObjDefnID) {
-        if (CJS_Object* pJSObj = params[8].ToCJSObject()) {
+        if (CJS_Object* pJSObj = params[8].ToCJSObject(pIsolate)) {
           if (PrintParamsObj* pprintparamsObj =
                   static_cast<PrintParamsObj*>(pJSObj->GetEmbedObject())) {
             bUI = pprintparamsObj->bUI;
             nStart = pprintparamsObj->nStart;
             nEnd = pprintparamsObj->nEnd;
             bSilent = pprintparamsObj->bSilent;
             bShrinkToFit = pprintparamsObj->bShrinkToFit;
             bPrintAsImage = pprintparamsObj->bPrintAsImage;
             bReverse = pprintparamsObj->bReverse;
             bAnnotations = pprintparamsObj->bAnnotations;
           }
         }
       }
     }
   } else {
     if (nlength >= 1)
-      bUI = params[0].ToBool();
+      bUI = params[0].ToBool(pIsolate);
     if (nlength >= 2)
-      nStart = params[1].ToInt();
+      nStart = params[1].ToInt(pIsolate);
     if (nlength >= 3)
-      nEnd = params[2].ToInt();
+      nEnd = params[2].ToInt(pIsolate);
     if (nlength >= 4)
-      bSilent = params[3].ToBool();
+      bSilent = params[3].ToBool(pIsolate);
     if (nlength >= 5)
-      bShrinkToFit = params[4].ToBool();
+      bShrinkToFit = params[4].ToBool(pIsolate);
     if (nlength >= 6)
-      bPrintAsImage = params[5].ToBool();
+      bPrintAsImage = params[5].ToBool(pIsolate);
     if (nlength >= 7)
-      bReverse = params[6].ToBool();
+      bReverse = params[6].ToBool(pIsolate);
     if (nlength >= 8)
-      bAnnotations = params[7].ToBool();
+      bAnnotations = params[7].ToBool(pIsolate);
   }
 
   if (CPDFDoc_Environment* pEnv = m_pDocument->GetEnv()) {
     pEnv->JS_docprint(bUI, nStart, nEnd, bSilent, bShrinkToFit, bPrintAsImage,
                       bReverse, bAnnotations);
     return TRUE;
   }
   return FALSE;
 }
 
 // removes the specified field from the document.
 // comment:
 // note: if the filed name is not retional, adobe is dumb for it.
 
 FX_BOOL Document::removeField(IJS_Context* cc,
                               const std::vector<CJS_Value>& params,
                               CJS_Value& vRet,
                               CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  v8::Isolate* pIsolate = pRuntime->GetIsolate();

[dsinclair, 2016/08/09 19:25:32]

Move to 488?

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+
   if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
         m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM)))
     return FALSE;
 
-  CJS_Context* pContext = (CJS_Context*)cc;
   if (params.size() != 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  CFX_WideString sFieldName = params[0].ToCFXWideString();
+  CFX_WideString sFieldName = params[0].ToCFXWideString(pIsolate);
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   std::vector<CPDFSDK_Widget*> widgets;
   pInterForm->GetWidgets(sFieldName, &widgets);
   if (widgets.empty())
     return TRUE;
 
   for (CPDFSDK_Widget* pWidget : widgets) {
     CFX_FloatRect rcAnnot = pWidget->GetRect();
     --rcAnnot.left;
     --rcAnnot.bottom;
@@ skipping 14 matching lines @@
 }
 
 // reset filed values within a document.
 // comment:
 // note: if the fields names r not rational, aodbe is dumb for it.
 
 FX_BOOL Document::resetForm(IJS_Context* cc,
                             const std::vector<CJS_Value>& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  v8::Isolate* pIsolate = pRuntime->GetIsolate();

[dsinclair, 2016/08/09 19:25:32]

Move to 548?

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+
   if (!(m_pDocument->GetPermissions(FPDFPERM_MODIFY) ||
         m_pDocument->GetPermissions(FPDFPERM_ANNOT_FORM) ||
         m_pDocument->GetPermissions(FPDFPERM_FILL_FORM)))
     return FALSE;
 
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
-  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array aName;
 
   if (params.empty()) {
     pPDFForm->ResetForm(TRUE);
     m_pDocument->SetChangeMark();
     return TRUE;
   }
 
   switch (params[0].GetType()) {
     default:
-      aName.Attach(params[0].ToV8Array());
+      aName.Attach(params[0].ToV8Array(pIsolate));
       break;
     case CJS_Value::VT_string:
       aName.SetElement(pRuntime->GetIsolate(), 0, params[0]);
       break;
   }
 
   std::vector<CPDF_FormField*> aFields;
   for (int i = 0, isz = aName.GetLength(); i < isz; ++i) {
     CJS_Value valElement(pRuntime);
     aName.GetElement(pRuntime->GetIsolate(), i, valElement);
-    CFX_WideString swVal = valElement.ToCFXWideString();
+    CFX_WideString swVal = valElement.ToCFXWideString(pIsolate);
     for (int j = 0, jsz = pPDFForm->CountFields(swVal); j < jsz; ++j)
       aFields.push_back(pPDFForm->GetField(j, swVal));
   }
 
   if (!aFields.empty()) {
     pPDFForm->ResetForm(aFields, TRUE, TRUE);
     m_pDocument->SetChangeMark();
   }
 
   return TRUE;
 }
 
 FX_BOOL Document::saveAs(IJS_Context* cc,
                          const std::vector<CJS_Value>& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
   // Unsafe, not supported.
   return TRUE;
 }
 
 FX_BOOL Document::submitForm(IJS_Context* cc,
                              const std::vector<CJS_Value>& params,
                              CJS_Value& vRet,
                              CFX_WideString& sError) {
-  CJS_Context* pContext = (CJS_Context*)cc;
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:32]

Move to 596?

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   int nSize = params.size();
   if (nSize < 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   v8::Isolate* isolate = pRuntime->GetIsolate();
   CJS_Array aFields;
   CFX_WideString strURL;
   FX_BOOL bFDF = TRUE;
   FX_BOOL bEmpty = FALSE;
 
   CJS_Value v = params[0];
   if (v.GetType() == CJS_Value::VT_string) {
-    strURL = params[0].ToCFXWideString();
+    strURL = params[0].ToCFXWideString(pIsolate);
     if (nSize > 1)
-      bFDF = params[1].ToBool();
+      bFDF = params[1].ToBool(pIsolate);
     if (nSize > 2)
-      bEmpty = params[2].ToBool();
+      bEmpty = params[2].ToBool(pIsolate);
     if (nSize > 3)
-      aFields.Attach(params[3].ToV8Array());
+      aFields.Attach(params[3].ToV8Array(pIsolate));
   } else if (v.GetType() == CJS_Value::VT_object) {
-    v8::Local<v8::Object> pObj = params[0].ToV8Object();
+    v8::Local<v8::Object> pObj = params[0].ToV8Object(pIsolate);
     v8::Local<v8::Value> pValue = FXJS_GetObjectElement(isolate, pObj, L"cURL");
     if (!pValue.IsEmpty())
-      strURL = CJS_Value(pRuntime, pValue).ToCFXWideString();
+      strURL = CJS_Value(pRuntime, pValue).ToCFXWideString(pIsolate);
 
     pValue = FXJS_GetObjectElement(isolate, pObj, L"bFDF");
-    bFDF = CJS_Value(pRuntime, pValue).ToBool();
+    bFDF = CJS_Value(pRuntime, pValue).ToBool(pIsolate);
 
     pValue = FXJS_GetObjectElement(isolate, pObj, L"bEmpty");
-    bEmpty = CJS_Value(pRuntime, pValue).ToBool();
+    bEmpty = CJS_Value(pRuntime, pValue).ToBool(pIsolate);
 
     pValue = FXJS_GetObjectElement(isolate, pObj, L"aFields");
-    aFields.Attach(CJS_Value(pRuntime, pValue).ToV8Array());
+    aFields.Attach(CJS_Value(pRuntime, pValue).ToV8Array(pIsolate));
   }
 
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFInterForm = pInterForm->GetInterForm();
   if (aFields.GetLength() == 0 && bEmpty) {
     if (pPDFInterForm->CheckRequiredFields(nullptr, true)) {
       pRuntime->BeginBlock();
       pInterForm->SubmitForm(strURL, FALSE);
       pRuntime->EndBlock();
     }
     return TRUE;
   }
 
   std::vector<CPDF_FormField*> fieldObjects;
   for (int i = 0, sz = aFields.GetLength(); i < sz; ++i) {
     CJS_Value valName(pRuntime);
     aFields.GetElement(pRuntime->GetIsolate(), i, valName);
 
-    CFX_WideString sName = valName.ToCFXWideString();
+    CFX_WideString sName = valName.ToCFXWideString(pIsolate);
     CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
     for (int j = 0, jsz = pPDFForm->CountFields(sName); j < jsz; ++j) {
       CPDF_FormField* pField = pPDFForm->GetField(j, sName);
       if (!bEmpty && pField->GetValue().IsEmpty())
         continue;
 
       fieldObjects.push_back(pField);
     }
   }
 
@@ skipping 16 matching lines @@
 FX_BOOL Document::bookmarkRoot(IJS_Context* cc,
                                CJS_PropValue& vp,
                                CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Document::mailDoc(IJS_Context* cc,
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:33]

...

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   FX_BOOL bUI = TRUE;
   CFX_WideString cTo = L"";
   CFX_WideString cCc = L"";
   CFX_WideString cBcc = L"";
   CFX_WideString cSubject = L"";
   CFX_WideString cMsg = L"";
 
   if (params.size() >= 1)
-    bUI = params[0].ToBool();
+    bUI = params[0].ToBool(pIsolate);
   if (params.size() >= 2)
-    cTo = params[1].ToCFXWideString();
+    cTo = params[1].ToCFXWideString(pIsolate);
   if (params.size() >= 3)
-    cCc = params[2].ToCFXWideString();
+    cCc = params[2].ToCFXWideString(pIsolate);
   if (params.size() >= 4)
-    cBcc = params[3].ToCFXWideString();
+    cBcc = params[3].ToCFXWideString(pIsolate);
   if (params.size() >= 5)
-    cSubject = params[4].ToCFXWideString();
+    cSubject = params[4].ToCFXWideString(pIsolate);
   if (params.size() >= 6)
-    cMsg = params[5].ToCFXWideString();
-
-  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
-  v8::Isolate* isolate = pRuntime->GetIsolate();
+    cMsg = params[5].ToCFXWideString(pIsolate);
 
   if (params.size() >= 1 && params[0].GetType() == CJS_Value::VT_object) {
-    v8::Local<v8::Object> pObj = params[0].ToV8Object();
+    v8::Local<v8::Object> pObj = params[0].ToV8Object(pIsolate);
 
-    v8::Local<v8::Value> pValue = FXJS_GetObjectElement(isolate, pObj, L"bUI");
-    bUI = CJS_Value(pRuntime, pValue).ToInt();
+    v8::Local<v8::Value> pValue = FXJS_GetObjectElement(pIsolate, pObj, L"bUI");
+    bUI = CJS_Value(pRuntime, pValue).ToInt(pIsolate);
 
-    pValue = FXJS_GetObjectElement(isolate, pObj, L"cTo");
-    cTo = CJS_Value(pRuntime, pValue).ToCFXWideString();
+    pValue = FXJS_GetObjectElement(pIsolate, pObj, L"cTo");
+    cTo = CJS_Value(pRuntime, pValue).ToCFXWideString(pIsolate);
 
-    pValue = FXJS_GetObjectElement(isolate, pObj, L"cCc");
-    cCc = CJS_Value(pRuntime, pValue).ToCFXWideString();
+    pValue = FXJS_GetObjectElement(pIsolate, pObj, L"cCc");
+    cCc = CJS_Value(pRuntime, pValue).ToCFXWideString(pIsolate);
 
-    pValue = FXJS_GetObjectElement(isolate, pObj, L"cBcc");
-    cBcc = CJS_Value(pRuntime, pValue).ToCFXWideString();
+    pValue = FXJS_GetObjectElement(pIsolate, pObj, L"cBcc");
+    cBcc = CJS_Value(pRuntime, pValue).ToCFXWideString(pIsolate);
 
-    pValue = FXJS_GetObjectElement(isolate, pObj, L"cSubject");
-    cSubject = CJS_Value(pRuntime, pValue).ToCFXWideString();
+    pValue = FXJS_GetObjectElement(pIsolate, pObj, L"cSubject");
+    cSubject = CJS_Value(pRuntime, pValue).ToCFXWideString(pIsolate);
 
-    pValue = FXJS_GetObjectElement(isolate, pObj, L"cMsg");
-    cMsg = CJS_Value(pRuntime, pValue).ToCFXWideString();
+    pValue = FXJS_GetObjectElement(pIsolate, pObj, L"cMsg");
+    cMsg = CJS_Value(pRuntime, pValue).ToCFXWideString(pIsolate);
   }
 
   pRuntime->BeginBlock();
   CPDFDoc_Environment* pEnv = pRuntime->GetReaderApp();
   pEnv->JS_docmailForm(nullptr, 0, bUI, cTo.c_str(), cSubject.c_str(),
                        cCc.c_str(), cBcc.c_str(), cMsg.c_str());
   pRuntime->EndBlock();
 
   return TRUE;
 }
@@ skipping 304 matching lines @@
                            const std::vector<CJS_Value>& params,
                            CJS_Value& vRet,
                            CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Document::getAnnots(IJS_Context* cc,
                             const std::vector<CJS_Value>& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
-  vRet.SetNull();
+  vRet.SetNull(CJS_Runtime::FromContext(cc));
   return TRUE;
 }
 
 FX_BOOL Document::getAnnot3D(IJS_Context* cc,
                              const std::vector<CJS_Value>& params,
                              CJS_Value& vRet,
                              CFX_WideString& sError) {
-  vRet.SetNull();
+  vRet.SetNull(CJS_Runtime::FromContext(cc));
   return TRUE;
 }
 
 FX_BOOL Document::getAnnots3D(IJS_Context* cc,
                               const std::vector<CJS_Value>& params,
                               CJS_Value& vRet,
                               CFX_WideString& sError) {
-  vRet = CJS_Value::VT_undefined;

[dsinclair, 2016/08/09 19:25:32]

Is this no longer needed?

[Tom Sepez, 2016/08/09 20:33:23]

It was wrong.  Not setting a value results in JS getting |undefined|.  This was
returning an integer whose value happened to be whatever constant we assigned to
the enum.  Not very useful.

   return TRUE;
 }
 
 FX_BOOL Document::getOCGs(IJS_Context* cc,
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Document::getLinks(IJS_Context* cc,
                            const std::vector<CJS_Value>& params,
                            CJS_Value& vRet,
                            CFX_WideString& sError) {
   return TRUE;
 }
 
 bool Document::IsEnclosedInRect(CFX_FloatRect rect, CFX_FloatRect LinkRect) {
   return (rect.left <= LinkRect.left && rect.top <= LinkRect.top &&
           rect.right >= LinkRect.right && rect.bottom >= LinkRect.bottom);
 }
 
 FX_BOOL Document::addIcon(IJS_Context* cc,
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
-  CJS_Context* pContext = (CJS_Context*)cc;
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:32]

...

[Tom Sepez, 2016/08/09 20:33:24]

Done.

+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   if (params.size() != 2) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
-  CFX_WideString swIconName = params[0].ToCFXWideString();
+  CFX_WideString swIconName = params[0].ToCFXWideString(pIsolate);
 
   if (params[1].GetType() != CJS_Value::VT_object) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
-  v8::Local<v8::Object> pJSIcon = params[1].ToV8Object();
+  v8::Local<v8::Object> pJSIcon = params[1].ToV8Object(pIsolate);
   if (FXJS_GetObjDefnID(pJSIcon) != CJS_Icon::g_nObjDefnID) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
-  CJS_EmbedObj* pEmbedObj = params[1].ToCJSObject()->GetEmbedObject();
+  CJS_EmbedObj* pEmbedObj = params[1].ToCJSObject(pIsolate)->GetEmbedObject();
   if (!pEmbedObj) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
   m_IconList.push_back(std::unique_ptr<IconElement>(
       new IconElement(swIconName, (Icon*)pEmbedObj)));
   return TRUE;
 }
 
 FX_BOOL Document::icons(IJS_Context* cc,
                         CJS_PropValue& vp,
                         CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);

[dsinclair, 2016/08/09 19:25:32]

...

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+
   if (vp.IsSetting()) {
-    CJS_Context* pContext = static_cast<CJS_Context*>(cc);
     sError = JSGetStringFromID(pContext, IDS_STRING_JSREADONLY);
     return FALSE;
   }
 
   if (m_IconList.empty()) {
-    vp.SetNull();
+    vp.GetJSValue()->SetNull(pRuntime);
     return TRUE;
   }
 
-  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array Icons;
 
   int i = 0;
   for (const auto& pIconElement : m_IconList) {
     v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(
         pRuntime->GetIsolate(), pRuntime, CJS_Icon::g_nObjDefnID);
     if (pObj.IsEmpty())
       return FALSE;
 
     CJS_Icon* pJS_Icon = (CJS_Icon*)FXJS_GetPrivate(m_isolate, pObj);
@@ skipping 11 matching lines @@
   }
 
   vp << Icons;
   return TRUE;
 }
 
 FX_BOOL Document::getIcon(IJS_Context* cc,
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
-  CJS_Context* pContext = (CJS_Context*)cc;
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:32]

...

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   if (params.size() != 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   if (m_IconList.empty())
     return FALSE;
 
-  CFX_WideString swIconName = params[0].ToCFXWideString();
-  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  CFX_WideString swIconName = params[0].ToCFXWideString(pIsolate);
 
   for (const auto& pIconElement : m_IconList) {
     if (pIconElement->IconName == swIconName) {
       Icon* pRetIcon = pIconElement->IconStream;
 
       v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(
           pRuntime->GetIsolate(), pRuntime, CJS_Icon::g_nObjDefnID);
       if (pObj.IsEmpty())
         return FALSE;
 
       CJS_Icon* pJS_Icon = (CJS_Icon*)FXJS_GetPrivate(m_isolate, pObj);
       if (!pJS_Icon)
         return FALSE;
 
       Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
       if (!pIcon)
         return FALSE;
 
       pIcon->SetIconName(swIconName);
       pIcon->SetStream(pRetIcon->GetStream());
-      vRet = pJS_Icon;
+      vRet = CJS_Value(pRuntime, pJS_Icon);
       return TRUE;
     }
   }
 
   return FALSE;
 }
 
 FX_BOOL Document::removeIcon(IJS_Context* cc,
                              const std::vector<CJS_Value>& params,
                              CJS_Value& vRet,
@@ skipping 33 matching lines @@
 FX_BOOL Document::Collab(IJS_Context* cc,
                          CJS_PropValue& vp,
                          CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Document::getPageNthWord(IJS_Context* cc,
                                  const std::vector<CJS_Value>& params,
                                  CJS_Value& vRet,
                                  CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);

[dsinclair, 2016/08/09 19:25:32]

...

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  v8::Isolate* pIsolate = pRuntime->GetIsolate();
+
   if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
     return FALSE;
 
-  int nPageNo = params.size() > 0 ? params[0].ToInt() : 0;
-  int nWordNo = params.size() > 1 ? params[1].ToInt() : 0;
-  bool bStrip = params.size() > 2 ? params[2].ToBool() : true;
+  int nPageNo = params.size() > 0 ? params[0].ToInt(pIsolate) : 0;
+  int nWordNo = params.size() > 1 ? params[1].ToInt(pIsolate) : 0;
+  bool bStrip = params.size() > 2 ? params[2].ToBool(pIsolate) : true;
 
   CPDF_Document* pDocument = m_pDocument->GetPDFDocument();
   if (!pDocument)
     return FALSE;
 
-  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
   if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
   CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
   if (!pPageDict)
     return FALSE;
 
   CPDF_Page page(pDocument, pPageDict, true);
@@ skipping 11 matching lines @@
       }
       nWords += nObjWords;
     }
   }
 
   if (bStrip) {
     swRet.TrimLeft();
     swRet.TrimRight();
   }
 
-  vRet = swRet.c_str();
+  vRet = CJS_Value(pRuntime, swRet.c_str());
   return TRUE;
 }
 
 FX_BOOL Document::getPageNthWordQuads(IJS_Context* cc,
                                       const std::vector<CJS_Value>& params,
                                       CJS_Value& vRet,
                                       CFX_WideString& sError) {
   if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
     return FALSE;
 
   return FALSE;
 }
 
 FX_BOOL Document::getPageNumWords(IJS_Context* cc,
                                   const std::vector<CJS_Value>& params,
                                   CJS_Value& vRet,
                                   CFX_WideString& sError) {
+  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
+  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
+  v8::Isolate* pIsolate = pRuntime->GetIsolate();

[dsinclair, 2016/08/09 19:25:33]

...

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+
   if (!m_pDocument->GetPermissions(FPDFPERM_EXTRACT_ACCESS))
     return FALSE;
 
-  int nPageNo = params.size() > 0 ? params[0].ToInt() : 0;
+  int nPageNo = params.size() > 0 ? params[0].ToInt(pIsolate) : 0;
   CPDF_Document* pDocument = m_pDocument->GetPDFDocument();
-  CJS_Context* pContext = static_cast<CJS_Context*>(cc);
   if (nPageNo < 0 || nPageNo >= pDocument->GetPageCount()) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
   CPDF_Dictionary* pPageDict = pDocument->GetPage(nPageNo);
   if (!pPageDict)
     return FALSE;
 
   CPDF_Page page(pDocument, pPageDict, true);
   page.ParseContent();
 
   int nWords = 0;
   for (auto& pPageObj : *page.GetPageObjectList()) {
     if (pPageObj->IsText())
       nWords += CountWords(pPageObj->AsText());
   }
 
-  vRet = nWords;
+  vRet = CJS_Value(pRuntime, nWords);
   return TRUE;
 }
 
 FX_BOOL Document::getPrintParams(IJS_Context* cc,
                                  const std::vector<CJS_Value>& params,
                                  CJS_Value& vRet,
                                  CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
   v8::Local<v8::Object> pRetObj = FXJS_NewFxDynamicObj(
       pRuntime->GetIsolate(), pRuntime, CJS_PrintParamsObj::g_nObjDefnID);
 
   // Not implemented yet.
 
-  vRet = pRetObj;
+  vRet = CJS_Value(pRuntime, pRetObj);
   return TRUE;
 }
 
 #define ISLATINWORD(u) (u != 0x20 && u <= 0x28FF)
 
 int Document::CountWords(CPDF_TextObject* pTextObj) {
   if (!pTextObj)
     return 0;
 
   int nWords = 0;
@@ skipping 122 matching lines @@
                          CFX_WideString& sError) {
   // Unsafe, not supported.
   return TRUE;
 }
 
 FX_BOOL Document::gotoNamedDest(IJS_Context* cc,
                                 const std::vector<CJS_Value>& params,
                                 CJS_Value& vRet,
                                 CFX_WideString& sError) {
   CJS_Context* context = (CJS_Context*)cc;
+  CJS_Runtime* runtime = context->GetJSRuntime();

[dsinclair, 2016/08/09 19:25:32]

...

[Tom Sepez, 2016/08/09 20:33:23]

Done.

+
   if (params.size() != 1) {
     sError = JSGetStringFromID(context, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
   CPDF_Document* pDocument = m_pDocument->GetPDFDocument();
   if (!pDocument)
     return FALSE;
 
-  CFX_WideString wideName = params[0].ToCFXWideString();
+  CFX_WideString wideName = params[0].ToCFXWideString(runtime->GetIsolate());
   CFX_ByteString utf8Name = wideName.UTF8Encode();
 
   CPDF_NameTree nameTree(pDocument, "Dests");
   CPDF_Array* destArray = nameTree.LookupNamedDest(pDocument, utf8Name);
   if (!destArray)
     return FALSE;
 
   CPDF_Dest dest(destArray);
   const CPDF_Array* arrayObject = ToArray(dest.GetObject());
 
   std::unique_ptr<float[]> scrollPositionArray;
   int scrollPositionArraySize = 0;
 
   if (arrayObject) {
     scrollPositionArray.reset(new float[arrayObject->GetCount()]);
     int j = 0;
     for (size_t i = 2; i < arrayObject->GetCount(); i++)
       scrollPositionArray[j++] = arrayObject->GetFloatAt(i);
     scrollPositionArraySize = j;
   }
 
-  CJS_Runtime* runtime = context->GetJSRuntime();
   runtime->BeginBlock();
   CPDFDoc_Environment* pApp = m_pDocument->GetEnv();
   pApp->FFI_DoGoToAction(dest.GetPageIndex(pDocument), dest.GetZoomMode(),
                          scrollPositionArray.get(), scrollPositionArraySize);
   runtime->EndBlock();
 
   return TRUE;
 }
 
 void Document::AddDelayData(CJS_DelayData* pData) {
@@ skipping 13 matching lines @@
     }
   }
 
   for (const auto& pData : DelayDataForFieldAndControlIndex)
     Field::DoDelay(m_pDocument, pData.get());
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }