Merge to XFA: Remove some abstractions in fxjs_v8.h.

fpdfsdk/src/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 "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_Define.h"
 #include "../../include/javascript/JS_Object.h"
@@ skipping 242 matching lines @@
     } else if (iPageNum >= iPageCount) {
       pEnv->JS_docgotoPage(iPageCount - 1);
     } else if (iPageNum < 0) {
       pEnv->JS_docgotoPage(0);
     }
   }
 
   return TRUE;
 }
 
-FX_BOOL Document::ParserParams(JSObject* pObj, CJS_AnnotObj& annotobj) {
-  // Not supported.
-  return TRUE;
-}
-
 FX_BOOL Document::addAnnot(IFXJS_Context* cc,
                            const CJS_Parameters& params,
                            CJS_Value& vRet,
                            CFX_WideString& sError) {
   // Not supported.
   return TRUE;
 }
 
 FX_BOOL Document::addField(IFXJS_Context* cc,
                            const CJS_Parameters& params,
@@ skipping 45 matching lines @@
   CFX_WideString wideName = params[0].ToCFXWideString();
 
   CPDFSDK_InterForm* pInterForm = m_pDocument->GetInterForm();
   CPDF_InterForm* pPDFForm = pInterForm->GetInterForm();
   if (pPDFForm->CountFields(wideName) <= 0) {
     vRet.SetNull();
     return TRUE;
   }
 
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-  JSFXObject pFieldObj = JS_NewFxDynamicObj(
-      *pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"Field"));
+  v8::Local<v8::Object> pFieldObj =
+      JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext,
+                         JS_GetObjDefnID(pRuntime->GetIsolate(), L"Field"));
 
   v8::Isolate* isolate = GetIsolate(cc);
   CJS_Field* pJSField = (CJS_Field*)JS_GetPrivate(isolate, pFieldObj);
   Field* pField = (Field*)pJSField->GetEmbedObject();
   pField->AttachField(this, wideName);
 
   vRet = pJSField;
   return TRUE;
 }
 
@@ skipping 110 matching lines @@
   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() == VT_fxobject) {
-      JSFXObject pObj = params[8].ToV8Object();
+      v8::Local<v8::Object> pObj = params[8].ToV8Object();
       {
         if (JS_GetObjDefnID(pObj) ==
-            JS_GetObjDefnID(*pRuntime, L"PrintParamsObj")) {
+            JS_GetObjDefnID(pRuntime->GetIsolate(), L"PrintParamsObj")) {
           if (CJS_Object* pJSObj = params[8].ToCJSObject()) {
             if (PrintParamsObj* pprintparamsObj =
                     (PrintParamsObj*)pJSObj->GetEmbedObject()) {
               bUI = pprintparamsObj->bUI;
               nStart = pprintparamsObj->nStart;
               nEnd = pprintparamsObj->nEnd;
               bSilent = pprintparamsObj->bSilent;
               bShrinkToFit = pprintparamsObj->bShrinkToFit;
               bPrintAsImage = pprintparamsObj->bPrintAsImage;
               bReverse = pprintparamsObj->bReverse;
@@ skipping 178 matching lines @@
   CJS_Value v = params[0];
   if (v.GetType() == VT_string) {
     strURL = params[0].ToCFXWideString();
     if (nSize > 1)
       bFDF = params[1].ToBool();
     if (nSize > 2)
       bEmpty = params[2].ToBool();
     if (nSize > 3)
       aFields.Attach(params[3].ToV8Array());
   } else if (v.GetType() == VT_object) {
-    JSObject pObj = params[0].ToV8Object();
+    v8::Local<v8::Object> pObj = params[0].ToV8Object();
     v8::Local<v8::Value> pValue = JS_GetObjectElement(isolate, pObj, L"cURL");
     if (!pValue.IsEmpty())
       strURL =
           CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToCFXWideString();
     pValue = JS_GetObjectElement(isolate, pObj, L"bFDF");
     bFDF = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToBool();
     pValue = JS_GetObjectElement(isolate, pObj, L"bEmpty");
     bEmpty = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToBool();
     pValue = JS_GetObjectElement(isolate, pObj, L"aFields");
     aFields.Attach(
@@ skipping 86 matching lines @@
   if (params.size() >= 4)
     cBcc = params[3].ToCFXWideString();
   if (params.size() >= 5)
     cSubject = params[4].ToCFXWideString();
   if (params.size() >= 6)
     cMsg = params[5].ToCFXWideString();
 
   v8::Isolate* isolate = GetIsolate(cc);
 
   if (params.size() >= 1 && params[0].GetType() == VT_object) {
-    JSObject pObj = params[0].ToV8Object();
+    v8::Local<v8::Object> pObj = params[0].ToV8Object();
 
     v8::Local<v8::Value> pValue = JS_GetObjectElement(isolate, pObj, L"bUI");
     bUI = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToInt();
 
     pValue = JS_GetObjectElement(isolate, pObj, L"cTo");
     cTo = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToCFXWideString();
 
     pValue = JS_GetObjectElement(isolate, pObj, L"cCc");
     cCc = CJS_Value(isolate, pValue, GET_VALUE_TYPE(pValue)).ToCFXWideString();
 
@@ skipping 64 matching lines @@
   CFX_WideString cwCreator = pDictionary->GetUnicodeText("Creator");
   CFX_WideString cwProducer = pDictionary->GetUnicodeText("Producer");
   CFX_WideString cwCreationDate = pDictionary->GetUnicodeText("CreationDate");
   CFX_WideString cwModDate = pDictionary->GetUnicodeText("ModDate");
   CFX_WideString cwTrapped = pDictionary->GetUnicodeText("Trapped");
 
   v8::Isolate* isolate = GetIsolate(cc);
   if (vp.IsGetting()) {
     CJS_Context* pContext = (CJS_Context*)cc;
     CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-
-    JSFXObject pObj = JS_NewFxDynamicObj(*pRuntime, pContext, -1);
-
+    v8::Local<v8::Object> pObj =
+        JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext, -1);
     JS_PutObjectString(isolate, pObj, L"Author", cwAuthor.c_str());
     JS_PutObjectString(isolate, pObj, L"Title", cwTitle.c_str());
     JS_PutObjectString(isolate, pObj, L"Subject", cwSubject.c_str());
     JS_PutObjectString(isolate, pObj, L"Keywords", cwKeywords.c_str());
     JS_PutObjectString(isolate, pObj, L"Creator", cwCreator.c_str());
     JS_PutObjectString(isolate, pObj, L"Producer", cwProducer.c_str());
     JS_PutObjectString(isolate, pObj, L"CreationDate", cwCreationDate.c_str());
     JS_PutObjectString(isolate, pObj, L"ModDate", cwModDate.c_str());
     JS_PutObjectString(isolate, pObj, L"Trapped", cwTrapped.c_str());
 
@@ skipping 535 matching lines @@
   if (params.size() != 2) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
   CFX_WideString swIconName = params[0].ToCFXWideString();
 
   if (params[1].GetType() != VT_object) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
-  JSFXObject pJSIcon = params[1].ToV8Object();
+  v8::Local<v8::Object> pJSIcon = params[1].ToV8Object();
 
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-  if (JS_GetObjDefnID(pJSIcon) != JS_GetObjDefnID(*pRuntime, L"Icon")) {
+  if (JS_GetObjDefnID(pJSIcon) !=
+      JS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon")) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
   CJS_EmbedObj* pEmbedObj = params[1].ToCJSObject()->GetEmbedObject();
   if (!pEmbedObj) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSTYPEERROR);
     return FALSE;
   }
 
@@ skipping 26 matching lines @@
   CJS_Array Icons(m_isolate);
   IconElement* pIconElement = NULL;
   int iIconTreeLength = m_pIconTree->GetLength();
 
   CJS_Context* pContext = (CJS_Context*)cc;
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
 
   for (int i = 0; i < iIconTreeLength; i++) {
     pIconElement = (*m_pIconTree)[i];
 
-    JSFXObject pObj = JS_NewFxDynamicObj(*pRuntime, pContext,
-                                         JS_GetObjDefnID(*pRuntime, L"Icon"));
+    v8::Local<v8::Object> pObj =
+        JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext,
+                           JS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon"));
     if (pObj.IsEmpty())
       return FALSE;
 
     CJS_Icon* pJS_Icon = (CJS_Icon*)JS_GetPrivate(pObj);
     if (!pJS_Icon)
       return FALSE;
 
     Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
     if (!pIcon)
       return FALSE;
@@ skipping 21 matching lines @@
     return FALSE;
   CFX_WideString swIconName = params[0].ToCFXWideString();
   int iIconCounts = m_pIconTree->GetLength();
 
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
 
   for (int i = 0; i < iIconCounts; i++) {
     if ((*m_pIconTree)[i]->IconName == swIconName) {
       Icon* pRetIcon = (*m_pIconTree)[i]->IconStream;
 
-      JSFXObject pObj = JS_NewFxDynamicObj(*pRuntime, pContext,
-                                           JS_GetObjDefnID(*pRuntime, L"Icon"));
+      v8::Local<v8::Object> pObj =
+          JS_NewFxDynamicObj(pRuntime->GetIsolate(), pContext,
+                             JS_GetObjDefnID(pRuntime->GetIsolate(), L"Icon"));
       if (pObj.IsEmpty())
         return FALSE;
 
       CJS_Icon* pJS_Icon = (CJS_Icon*)JS_GetPrivate(pObj);
       if (!pJS_Icon)
         return FALSE;
 
       Icon* pIcon = (Icon*)pJS_Icon->GetEmbedObject();
       if (!pIcon)
         return FALSE;
@@ skipping 179 matching lines @@
 
   return TRUE;
 }
 
 FX_BOOL Document::getPrintParams(IFXJS_Context* cc,
                                  const CJS_Parameters& params,
                                  CJS_Value& vRet,
                                  CFX_WideString& sError) {
   CJS_Context* pContext = (CJS_Context*)cc;
   CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-  JSFXObject pRetObj = JS_NewFxDynamicObj(
-      *pRuntime, pContext, JS_GetObjDefnID(*pRuntime, L"PrintParamsObj"));
+  v8::Local<v8::Object> pRetObj = JS_NewFxDynamicObj(
+      pRuntime->GetIsolate(), pContext,
+      JS_GetObjDefnID(pRuntime->GetIsolate(), L"PrintParamsObj"));
 
   // Not implemented yet.
 
   vRet = pRetObj;
   return TRUE;
 }
 
 #define ISLATINWORD(u) (u != 0x20 && u <= 0x28FF)
 
 int Document::CountWords(CPDF_TextObject* pTextObj) {
@@ skipping 102 matching lines @@
     return FALSE;
 
   int iSize = params.size();
 
   int nStart = 0;
   int nEnd = 0;
 
   if (iSize < 1) {
   } else if (iSize == 1) {
     if (params[0].GetType() == VT_object) {
-      JSObject pObj = params[0].ToV8Object();
+      v8::Local<v8::Object> pObj = params[0].ToV8Object();
       v8::Local<v8::Value> pValue =
           JS_GetObjectElement(isolate, pObj, L"nStart");
       nStart = CJS_Value(m_isolate, pValue, GET_VALUE_TYPE(pValue)).ToInt();
 
       pValue = JS_GetObjectElement(isolate, pObj, L"nEnd");
       nEnd = CJS_Value(m_isolate, pValue, GET_VALUE_TYPE(pValue)).ToInt();
     } else {
       nStart = params[0].ToInt();
     }
   } else {
@@ skipping 84 matching lines @@
   CFX_DWordArray DelArray;
 
   for (int j = DelArray.GetSize() - 1; j >= 0; j--) {
     m_DelayData.RemoveAt(DelArray[j]);
   }
 }
 
 CJS_Document* Document::GetCJSDoc() const {
   return static_cast<CJS_Document*>(m_pJSObject);
 }