Remove backpointer to CJS_Runtime from CJS_Value

fpdfsdk/javascript/Field.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/Field.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 937 matching lines @@
 FX_BOOL Field::currentValueIndices(IJS_Context* cc,
                                    CJS_PropValue& vp,
                                    CFX_WideString& sError) {
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
 
     std::vector<uint32_t> array;
-    if (vp.GetType() == CJS_Value::VT_number) {
+    if (vp.GetJSValue()->GetType() == CJS_Value::VT_number) {
       int iSelecting = 0;
       vp >> iSelecting;
       array.push_back(iSelecting);
-    } else if (vp.IsArrayObject()) {
+    } else if (vp.GetJSValue()->IsArrayObject()) {
       CJS_Array SelArray;
       CJS_Value SelValue(pRuntime);
       int iSelecting;
       vp >> SelArray;
       for (int i = 0, sz = SelArray.GetLength(); i < sz; i++) {
         SelArray.GetElement(pRuntime->GetIsolate(), i, SelValue);
-        iSelecting = SelValue.ToInt();
+        iSelecting = SelValue.ToInt(pRuntime->GetIsolate());
         array.push_back(iSelecting);
       }
     }
 
     if (m_bDelay) {
       AddDelay_WordArray(FP_CURRENTVALUEINDICES, array);
     } else {
       Field::SetCurrentValueIndices(m_pDocument, m_FieldName,
                                     m_nFormControlIndex, array);
     }
@@ skipping 388 matching lines @@
   CPDF_FormField* pFormField = FieldArray[0];
   if (pFormField->GetFieldType() != FIELDTYPE_CHECKBOX &&
       pFormField->GetFieldType() != FIELDTYPE_RADIOBUTTON) {
     return FALSE;
   }
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
 
-    if (!vp.IsArrayObject())
+    if (!vp.GetJSValue()->IsArrayObject())
       return FALSE;
   } else {
     CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
     CJS_Array ExportValusArray;
     if (m_nFormControlIndex < 0) {
       for (int i = 0, sz = pFormField->CountControls(); i < sz; i++) {
         CPDF_FormControl* pFormControl = pFormField->GetControl(i);
         ExportValusArray.SetElement(
             pRuntime->GetIsolate(), i,
             CJS_Value(pRuntime, pFormControl->GetExportValue().c_str()));
@@ skipping 48 matching lines @@
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array crArray;
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
 
-    if (!vp.IsArrayObject())
+    if (!vp.GetJSValue()->IsArrayObject())
       return FALSE;
 
     vp >> crArray;
 
     CPWL_Color color;
     color::ConvertArrayToPWLColor(pRuntime, crArray, &color);
     if (m_bDelay) {
       AddDelay_Color(FP_FILLCOLOR, color);
     } else {
       Field::SetFillColor(m_pDocument, m_FieldName, m_nFormControlIndex, color);
@@ skipping 619 matching lines @@
                     CFX_WideString& sError) {
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Value Upper_Leftx(pRuntime);
   CJS_Value Upper_Lefty(pRuntime);
   CJS_Value Lower_Rightx(pRuntime);
   CJS_Value Lower_Righty(pRuntime);
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
-    if (!vp.IsArrayObject())
+    if (!vp.GetJSValue()->IsArrayObject())
       return FALSE;
 
     CJS_Array rcArray;
     vp >> rcArray;
     rcArray.GetElement(pRuntime->GetIsolate(), 0, Upper_Leftx);
     rcArray.GetElement(pRuntime->GetIsolate(), 1, Upper_Lefty);
     rcArray.GetElement(pRuntime->GetIsolate(), 2, Lower_Rightx);
     rcArray.GetElement(pRuntime->GetIsolate(), 3, Lower_Righty);
 
     FX_FLOAT pArray[4] = {0.0f, 0.0f, 0.0f, 0.0f};
-    pArray[0] = (FX_FLOAT)Upper_Leftx.ToInt();
-    pArray[1] = (FX_FLOAT)Lower_Righty.ToInt();
-    pArray[2] = (FX_FLOAT)Lower_Rightx.ToInt();
-    pArray[3] = (FX_FLOAT)Upper_Lefty.ToInt();
+    pArray[0] = (FX_FLOAT)Upper_Leftx.ToInt(pRuntime->GetIsolate());
+    pArray[1] = (FX_FLOAT)Lower_Righty.ToInt(pRuntime->GetIsolate());
+    pArray[2] = (FX_FLOAT)Lower_Rightx.ToInt(pRuntime->GetIsolate());
+    pArray[3] = (FX_FLOAT)Upper_Lefty.ToInt(pRuntime->GetIsolate());

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

static_cast?

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

Done.

 
     CFX_FloatRect crRect(pArray);
     if (m_bDelay) {
       AddDelay_Rect(FP_RECT, crRect);
     } else {
       Field::SetRect(m_pDocument, m_FieldName, m_nFormControlIndex, crRect);
     }
   } else {
     std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
     if (FieldArray.empty())
       return FALSE;
 
     CPDF_FormField* pFormField = FieldArray[0];
     CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
     CPDFSDK_Widget* pWidget =
         pInterForm->GetWidget(GetSmartFieldControl(pFormField));
     if (!pWidget)
       return FALSE;
 
     CFX_FloatRect crRect = pWidget->GetRect();
-    Upper_Leftx = (int32_t)crRect.left;
-    Upper_Lefty = (int32_t)crRect.top;
-    Lower_Rightx = (int32_t)crRect.right;
-    Lower_Righty = (int32_t)crRect.bottom;
+    Upper_Leftx = CJS_Value(pRuntime, (int32_t)crRect.left);

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

static_cast? (and below)

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

Done.

+    Upper_Lefty = CJS_Value(pRuntime, (int32_t)crRect.top);
+    Lower_Rightx = CJS_Value(pRuntime, (int32_t)crRect.right);
+    Lower_Righty = CJS_Value(pRuntime, (int32_t)crRect.bottom);
 
     CJS_Array rcArray;
     rcArray.SetElement(pRuntime->GetIsolate(), 0, Upper_Leftx);
     rcArray.SetElement(pRuntime->GetIsolate(), 1, Upper_Lefty);
     rcArray.SetElement(pRuntime->GetIsolate(), 2, Lower_Rightx);
     rcArray.SetElement(pRuntime->GetIsolate(), 3, Lower_Righty);
     vp << rcArray;
   }
   return TRUE;
 }
@@ skipping 166 matching lines @@
 FX_BOOL Field::strokeColor(IJS_Context* cc,
                            CJS_PropValue& vp,
                            CFX_WideString& sError) {
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array crArray;
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
 
-    if (!vp.IsArrayObject())
+    if (!vp.GetJSValue()->IsArrayObject())
       return FALSE;
 
     vp >> crArray;
 
     CPWL_Color color;
     color::ConvertArrayToPWLColor(pRuntime, crArray, &color);
 
     if (m_bDelay) {
       AddDelay_Color(FP_STROKECOLOR, color);
     } else {
@@ skipping 124 matching lines @@
 FX_BOOL Field::textColor(IJS_Context* cc,
                          CJS_PropValue& vp,
                          CFX_WideString& sError) {
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Array crArray;
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
 
-    if (!vp.IsArrayObject())
+    if (!vp.GetJSValue()->IsArrayObject())
       return FALSE;
 
     vp >> crArray;
 
     CPWL_Color color;
     color::ConvertArrayToPWLColor(pRuntime, crArray, &color);
 
     if (m_bDelay) {
       AddDelay_Color(FP_TEXTCOLOR, color);
     } else {
@@ skipping 223 matching lines @@
 FX_BOOL Field::value(IJS_Context* cc,
                      CJS_PropValue& vp,
                      CFX_WideString& sError) {
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
 
   if (vp.IsSetting()) {
     if (!m_bCanSet)
       return FALSE;
 
     std::vector<CFX_WideString> strArray;
-    if (vp.IsArrayObject()) {
+    if (vp.GetJSValue()->IsArrayObject()) {
       CJS_Array ValueArray;
-      vp.ConvertToArray(ValueArray);
+      vp.GetJSValue()->ConvertToArray(pRuntime->GetIsolate(), ValueArray);
       for (int i = 0, sz = ValueArray.GetLength(); i < sz; i++) {
         CJS_Value ElementValue(pRuntime);
         ValueArray.GetElement(pRuntime->GetIsolate(), i, ElementValue);
-        strArray.push_back(ElementValue.ToCFXWideString());
+        strArray.push_back(
+            ElementValue.ToCFXWideString(pRuntime->GetIsolate()));
       }
     } else {
       CFX_WideString swValue;
       vp >> swValue;
       strArray.push_back(swValue);
     }
 
     if (m_bDelay) {
       AddDelay_WideStringArray(FP_VALUE, strArray);
     } else {
@@ skipping 12 matching lines @@
       case FIELDTYPE_TEXTFIELD: {
         vp << pFormField->GetValue();
       } break;
       case FIELDTYPE_LISTBOX: {
         if (pFormField->CountSelectedItems() > 1) {
           CJS_Array ValueArray;
           CJS_Value ElementValue(pRuntime);
           int iIndex;
           for (int i = 0, sz = pFormField->CountSelectedItems(); i < sz; i++) {
             iIndex = pFormField->GetSelectedIndex(i);
-            ElementValue = pFormField->GetOptionValue(iIndex).c_str();
-            if (FXSYS_wcslen(ElementValue.ToCFXWideString().c_str()) == 0)
-              ElementValue = pFormField->GetOptionLabel(iIndex).c_str();
+            ElementValue =
+                CJS_Value(pRuntime, pFormField->GetOptionValue(iIndex).c_str());
+            if (FXSYS_wcslen(
+                    ElementValue.ToCFXWideString(pRuntime->GetIsolate())
+                        .c_str()) == 0)

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

nit: {}'s

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

Done.

+              ElementValue = CJS_Value(
+                  pRuntime, pFormField->GetOptionLabel(iIndex).c_str());
             ValueArray.SetElement(pRuntime->GetIsolate(), i, ElementValue);
           }
           vp << ValueArray;
         } else {
           vp << pFormField->GetValue();
         }
       } break;
       case FIELDTYPE_CHECKBOX:
       case FIELDTYPE_RADIOBUTTON: {
         bool bFind = false;
         for (int i = 0, sz = pFormField->CountControls(); i < sz; i++) {
           if (pFormField->GetControl(i)->IsChecked()) {
             vp << pFormField->GetControl(i)->GetExportValue();
             bFind = true;
             break;
           }
         }
         if (!bFind)
           vp << L"Off";
       } break;
       default:
         vp << pFormField->GetValue();
         break;
     }
   }
-  vp.MaybeCoerceToNumber();
+  vp.GetJSValue()->MaybeCoerceToNumber(m_isolate);
   return TRUE;
 }
 
 void Field::SetValue(CPDFSDK_Document* pDocument,
                      const CFX_WideString& swFieldName,
                      int nControlIndex,
                      const std::vector<CFX_WideString>& strArray) {
   ASSERT(pDocument);
   if (strArray.empty())
     return;
@@ skipping 105 matching lines @@
     }
     return TRUE;
   }
   return FALSE;
 }
 
 FX_BOOL Field::buttonGetCaption(IJS_Context* cc,
                                 const std::vector<CJS_Value>& params,
                                 CJS_Value& vRet,
                                 CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
+
   int nface = 0;
   int iSize = params.size();
   if (iSize >= 1)
-    nface = params[0].ToInt();
+    nface = params[0].ToInt(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
   if (pFormField->GetFieldType() != FIELDTYPE_PUSHBUTTON)
     return FALSE;
 
   CPDF_FormControl* pFormControl = GetSmartFieldControl(pFormField);
   if (!pFormControl)
     return FALSE;
 
   if (nface == 0)
-    vRet = pFormControl->GetNormalCaption().c_str();
+    vRet = CJS_Value(pRuntime, pFormControl->GetNormalCaption().c_str());
   else if (nface == 1)
-    vRet = pFormControl->GetDownCaption().c_str();
+    vRet = CJS_Value(pRuntime, pFormControl->GetDownCaption().c_str());
   else if (nface == 2)
-    vRet = pFormControl->GetRolloverCaption().c_str();
+    vRet = CJS_Value(pRuntime, pFormControl->GetRolloverCaption().c_str());
   else
     return FALSE;
 
   return TRUE;
 }
 
 FX_BOOL Field::buttonGetIcon(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();
+
   int nface = 0;
   int iSize = params.size();
   if (iSize >= 1)
-    nface = params[0].ToInt();
+    nface = params[0].ToInt(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
   if (pFormField->GetFieldType() != FIELDTYPE_PUSHBUTTON)
     return FALSE;
 
   CPDF_FormControl* pFormControl = GetSmartFieldControl(pFormField);
   if (!pFormControl)
     return FALSE;
 
-  CJS_Context* pContext = (CJS_Context*)cc;
-  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
   v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(
       pRuntime->GetIsolate(), pRuntime, CJS_Icon::g_nObjDefnID);
   ASSERT(pObj.IsEmpty() == FALSE);
 
   CJS_Icon* pJS_Icon = (CJS_Icon*)FXJS_GetPrivate(pRuntime->GetIsolate(), pObj);
   Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
 
   CPDF_Stream* pIconStream = nullptr;
   if (nface == 0)
     pIconStream = pFormControl->GetNormalIcon();
   else if (nface == 1)
     pIconStream = pFormControl->GetDownIcon();
   else if (nface == 2)
     pIconStream = pFormControl->GetRolloverIcon();
   else
     return FALSE;
 
   pIcon->SetStream(pIconStream);
-  vRet = pJS_Icon;
-
+  vRet = CJS_Value(pRuntime, pJS_Icon);
   return TRUE;
 }
 
 FX_BOOL Field::buttonImportIcon(IJS_Context* cc,
                                 const std::vector<CJS_Value>& params,
                                 CJS_Value& vRet,
                                 CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Field::buttonSetCaption(IJS_Context* cc,
                                 const std::vector<CJS_Value>& params,
                                 CJS_Value& vRet,
                                 CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL Field::buttonSetIcon(IJS_Context* cc,
                              const std::vector<CJS_Value>& params,
                              CJS_Value& vRet,
                              CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL Field::checkThisBox(IJS_Context* cc,
                             const std::vector<CJS_Value>& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);

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

...

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

Done.

   ASSERT(m_pDocument);
 
   if (!m_bCanSet)
     return FALSE;
 
   int iSize = params.size();
   if (iSize < 1)
     return FALSE;
 
-  int nWidget = params[0].ToInt();
+  int nWidget = params[0].ToInt(pRuntime->GetIsolate());
 
   bool bCheckit = true;
   if (iSize >= 2)
-    bCheckit = params[1].ToBool();
+    bCheckit = params[1].ToBool(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
   if (pFormField->GetFieldType() != FIELDTYPE_CHECKBOX &&
       pFormField->GetFieldType() != FIELDTYPE_RADIOBUTTON)
     return FALSE;
   if (nWidget < 0 || nWidget >= pFormField->CountControls())
@@ skipping 13 matching lines @@
                           const std::vector<CJS_Value>& params,
                           CJS_Value& vRet,
                           CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Field::defaultIsChecked(IJS_Context* cc,
                                 const std::vector<CJS_Value>& params,
                                 CJS_Value& vRet,
                                 CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);

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

...

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

Done.

+
   if (!m_bCanSet)
     return FALSE;
 
   int iSize = params.size();
   if (iSize < 1)
     return FALSE;
 
-  int nWidget = params[0].ToInt();
+  int nWidget = params[0].ToInt(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
-  if (nWidget < 0 || nWidget >= pFormField->CountControls()) {
-    vRet = FALSE;

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

Not needed?

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

When we return false, JS throws an execption, and the returned value isn't used.
 The code should be specifiying an error via serror though ...

+  if (nWidget < 0 || nWidget >= pFormField->CountControls())
     return FALSE;
-  }
-  vRet = pFormField->GetFieldType() == FIELDTYPE_CHECKBOX ||
-         pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON;
+
+  vRet = CJS_Value(pRuntime,
+                   pFormField->GetFieldType() == FIELDTYPE_CHECKBOX ||
+                       pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON);
 
   return TRUE;
 }
 
 FX_BOOL Field::deleteItemAt(IJS_Context* cc,
                             const std::vector<CJS_Value>& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
   return TRUE;
 }
@@ skipping 24 matching lines @@
   int j = 0;
   for (const auto& pStr : swSort) {
     v8::Local<v8::Object> pObj = FXJS_NewFxDynamicObj(
         pRuntime->GetIsolate(), pRuntime, CJS_Field::g_nObjDefnID);
     ASSERT(!pObj.IsEmpty());
 
     CJS_Field* pJSField =
         static_cast<CJS_Field*>(FXJS_GetPrivate(pRuntime->GetIsolate(), pObj));
     Field* pField = static_cast<Field*>(pJSField->GetEmbedObject());
     pField->AttachField(m_pJSDoc, *pStr);
-
-    CJS_Value FormFieldValue(pRuntime);
-    FormFieldValue = pJSField;
-    FormFieldArray.SetElement(pRuntime->GetIsolate(), j++, FormFieldValue);
+    FormFieldArray.SetElement(pRuntime->GetIsolate(), j++,
+                              CJS_Value(pRuntime, pJSField));
   }
 
   vRet = CJS_Value(pRuntime, FormFieldArray);
   return TRUE;
 }
 
 FX_BOOL Field::getItemAt(IJS_Context* cc,
                          const std::vector<CJS_Value>& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
+
   int iSize = params.size();
-
   int nIdx = -1;
   if (iSize >= 1)
-    nIdx = params[0].ToInt();
+    nIdx = params[0].ToInt(pRuntime->GetIsolate());
 
   FX_BOOL bExport = TRUE;
   if (iSize >= 2)
-    bExport = params[1].ToBool();
+    bExport = params[1].ToBool(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
   if ((pFormField->GetFieldType() == FIELDTYPE_LISTBOX) ||
       (pFormField->GetFieldType() == FIELDTYPE_COMBOBOX)) {
     if (nIdx == -1 || nIdx > pFormField->CountOptions())
       nIdx = pFormField->CountOptions() - 1;
     if (bExport) {
       CFX_WideString strval = pFormField->GetOptionValue(nIdx);
       if (strval.IsEmpty())
-        vRet = pFormField->GetOptionLabel(nIdx).c_str();
+        vRet = CJS_Value(pRuntime, pFormField->GetOptionLabel(nIdx).c_str());
       else
-        vRet = strval.c_str();
+        vRet = CJS_Value(pRuntime, strval.c_str());
     } else {
-      vRet = pFormField->GetOptionLabel(nIdx).c_str();
+      vRet = CJS_Value(pRuntime, pFormField->GetOptionLabel(nIdx).c_str());
     }
   } else {
     return FALSE;
   }
 
   return TRUE;
 }
 
 FX_BOOL Field::getLock(IJS_Context* cc,
                        const std::vector<CJS_Value>& params,
                        CJS_Value& vRet,
                        CFX_WideString& sError) {
   return FALSE;
 }
 
 FX_BOOL Field::insertItemAt(IJS_Context* cc,
                             const std::vector<CJS_Value>& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
   return TRUE;
 }
 
 FX_BOOL Field::isBoxChecked(IJS_Context* cc,
                             const std::vector<CJS_Value>& params,
                             CJS_Value& vRet,
                             CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
+
   int nIndex = -1;
   if (params.size() >= 1)
-    nIndex = params[0].ToInt();
+    nIndex = params[0].ToInt(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
   if (nIndex < 0 || nIndex >= pFormField->CountControls()) {
-    vRet = FALSE;

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

Not needed?

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

See above.

     return FALSE;
   }
 
-  if ((pFormField->GetFieldType() == FIELDTYPE_CHECKBOX) ||
-      (pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON)) {
-    if (pFormField->GetControl(nIndex)->IsChecked() != 0)
-      vRet = TRUE;
-    else
-      vRet = FALSE;
-  } else {
-    vRet = FALSE;
-  }
-
+  vRet = CJS_Value(pRuntime,
+                   ((pFormField->GetFieldType() == FIELDTYPE_CHECKBOX ||
+                     pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON) &&
+                    pFormField->GetControl(nIndex)->IsChecked() != 0));
   return TRUE;
 }
 
 FX_BOOL Field::isDefaultChecked(IJS_Context* cc,
                                 const std::vector<CJS_Value>& params,
                                 CJS_Value& vRet,
                                 CFX_WideString& sError) {
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
+
   int nIndex = -1;
   if (params.size() >= 1)
-    nIndex = params[0].ToInt();
+    nIndex = params[0].ToInt(pRuntime->GetIsolate());
 
   std::vector<CPDF_FormField*> FieldArray = GetFormFields(m_FieldName);
   if (FieldArray.empty())
     return FALSE;
 
   CPDF_FormField* pFormField = FieldArray[0];
-  if (nIndex < 0 || nIndex >= pFormField->CountControls()) {
-    vRet = FALSE;

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

...

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

...

+  if (nIndex < 0 || nIndex >= pFormField->CountControls())
     return FALSE;
-  }
-  if ((pFormField->GetFieldType() == FIELDTYPE_CHECKBOX) ||
-      (pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON)) {
-    if (pFormField->GetControl(nIndex)->IsDefaultChecked() != 0)
-      vRet = TRUE;
-    else
-      vRet = FALSE;
-  } else {
-    vRet = FALSE;
-  }
 
+  vRet = CJS_Value(pRuntime,
+                   ((pFormField->GetFieldType() == FIELDTYPE_CHECKBOX ||
+                     pFormField->GetFieldType() == FIELDTYPE_RADIOBUTTON) &&
+                    pFormField->GetControl(nIndex)->IsDefaultChecked() != 0));
   return TRUE;
 }
 
 FX_BOOL Field::setAction(IJS_Context* cc,
                          const std::vector<CJS_Value>& params,
                          CJS_Value& vRet,
                          CFX_WideString& sError) {
   return TRUE;
 }
 
@@ skipping 304 matching lines @@
   }
 }
 
 void Field::AddField(CPDFSDK_Document* pDocument,
                      int nPageIndex,
                      int nFieldType,
                      const CFX_WideString& sName,
                      const CFX_FloatRect& rcCoords) {
   // Not supported.
 }