Push v8::Isolate into CFXJS_Engine class

fpdfsdk/javascript/util.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/util.h"
 
 #include <time.h>
 
@@ skipping 104 matching lines @@
 util::~util() {}
 
 FX_BOOL util::printf(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();
   if (iSize < 1)
     return FALSE;
-  std::wstring c_ConvChar(
-      params[0].ToCFXWideString(pRuntime->GetIsolate()).c_str());
+  std::wstring c_ConvChar(params[0].ToCFXWideString(pRuntime).c_str());
   std::vector<std::wstring> c_strConvers;
   int iOffset = 0;
   int iOffend = 0;
   c_ConvChar.insert(c_ConvChar.begin(), L'S');
   while (iOffset != -1) {
     iOffend = c_ConvChar.find(L"%", iOffset + 1);
     std::wstring strSub;
     if (iOffend == -1)
       strSub = c_ConvChar.substr(iOffset);
     else
@@ skipping 12 matching lines @@
     }
 
     CFX_WideString strSegment;
     if (iIndex >= iSize) {
       c_strResult += c_strFormat;
       continue;
     }
 
     switch (ParseDataType(&c_strFormat)) {
       case UTIL_INT:
-        strSegment.Format(c_strFormat.c_str(),
-                          params[iIndex].ToInt(pRuntime->GetIsolate()));
+        strSegment.Format(c_strFormat.c_str(), params[iIndex].ToInt(pRuntime));
         break;
       case UTIL_DOUBLE:
         strSegment.Format(c_strFormat.c_str(),
-                          params[iIndex].ToDouble(pRuntime->GetIsolate()));
+                          params[iIndex].ToDouble(pRuntime));
         break;
       case UTIL_STRING:
-        strSegment.Format(
-            c_strFormat.c_str(),
-            params[iIndex].ToCFXWideString(pRuntime->GetIsolate()).c_str());
+        strSegment.Format(c_strFormat.c_str(),
+                          params[iIndex].ToCFXWideString(pRuntime).c_str());
         break;
       default:
         strSegment.Format(L"%S", c_strFormat.c_str());
         break;
     }
     c_strResult += strSegment.GetBuffer(strSegment.GetLength() + 1);
   }
 
   c_strResult.erase(c_strResult.begin());
   vRet = CJS_Value(pRuntime, c_strResult.c_str());
   return TRUE;
 }
 
 FX_BOOL util::printd(IJS_Context* cc,
                      const std::vector<CJS_Value>& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
   int iSize = params.size();
   if (iSize < 2)
     return FALSE;
 
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
   CJS_Value p1 = params[0];
   CJS_Value p2 = params[1];
   CJS_Date jsDate;
-  if (!p2.ConvertToDate(pRuntime->GetIsolate(), jsDate)) {
+  if (!p2.ConvertToDate(pRuntime, jsDate)) {
     sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT1);
     return FALSE;
   }
 
-  if (!jsDate.IsValidDate(pRuntime->GetIsolate())) {
+  if (!jsDate.IsValidDate(pRuntime)) {
     sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT2);
     return FALSE;
   }
 
   if (p1.GetType() == CJS_Value::VT_number) {
     CFX_WideString swResult;
-    switch (p1.ToInt(pRuntime->GetIsolate())) {
+    switch (p1.ToInt(pRuntime)) {
       case 0:
-        swResult.Format(L"D:%04d%02d%02d%02d%02d%02d",
-                        jsDate.GetYear(pRuntime->GetIsolate()),
-                        jsDate.GetMonth(pRuntime->GetIsolate()) + 1,
-                        jsDate.GetDay(pRuntime->GetIsolate()),
-                        jsDate.GetHours(pRuntime->GetIsolate()),
-                        jsDate.GetMinutes(pRuntime->GetIsolate()),
-                        jsDate.GetSeconds(pRuntime->GetIsolate()));
+        swResult.Format(L"D:%04d%02d%02d%02d%02d%02d", jsDate.GetYear(pRuntime),
+                        jsDate.GetMonth(pRuntime) + 1, jsDate.GetDay(pRuntime),
+                        jsDate.GetHours(pRuntime), jsDate.GetMinutes(pRuntime),
+                        jsDate.GetSeconds(pRuntime));
         break;
       case 1:
         swResult.Format(L"%04d.%02d.%02d %02d:%02d:%02d",
-                        jsDate.GetYear(pRuntime->GetIsolate()),
-                        jsDate.GetMonth(pRuntime->GetIsolate()) + 1,
-                        jsDate.GetDay(pRuntime->GetIsolate()),
-                        jsDate.GetHours(pRuntime->GetIsolate()),
-                        jsDate.GetMinutes(pRuntime->GetIsolate()),
-                        jsDate.GetSeconds(pRuntime->GetIsolate()));
+                        jsDate.GetYear(pRuntime), jsDate.GetMonth(pRuntime) + 1,
+                        jsDate.GetDay(pRuntime), jsDate.GetHours(pRuntime),
+                        jsDate.GetMinutes(pRuntime),
+                        jsDate.GetSeconds(pRuntime));
         break;
       case 2:
         swResult.Format(L"%04d/%02d/%02d %02d:%02d:%02d",
-                        jsDate.GetYear(pRuntime->GetIsolate()),
-                        jsDate.GetMonth(pRuntime->GetIsolate()) + 1,
-                        jsDate.GetDay(pRuntime->GetIsolate()),
-                        jsDate.GetHours(pRuntime->GetIsolate()),
-                        jsDate.GetMinutes(pRuntime->GetIsolate()),
-                        jsDate.GetSeconds(pRuntime->GetIsolate()));
+                        jsDate.GetYear(pRuntime), jsDate.GetMonth(pRuntime) + 1,
+                        jsDate.GetDay(pRuntime), jsDate.GetHours(pRuntime),
+                        jsDate.GetMinutes(pRuntime),
+                        jsDate.GetSeconds(pRuntime));
         break;
       default:
         sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSVALUEERROR);
         return FALSE;
     }
 
     vRet = CJS_Value(pRuntime, swResult.c_str());
     return TRUE;
   }
 
   if (p1.GetType() == CJS_Value::VT_string) {
-    if (iSize > 2 && params[2].ToBool(pRuntime->GetIsolate())) {
+    if (iSize > 2 && params[2].ToBool(pRuntime)) {
       sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_NOTSUPPORT);
       return FALSE;  // currently, it doesn't support XFAPicture.
     }
 
     // Convert PDF-style format specifiers to wcsftime specifiers. Remove any
     // pre-existing %-directives before inserting our own.
-    std::basic_string<wchar_t> cFormat =
-        p1.ToCFXWideString(pRuntime->GetIsolate()).c_str();
+    std::basic_string<wchar_t> cFormat = p1.ToCFXWideString(pRuntime).c_str();
     cFormat.erase(std::remove(cFormat.begin(), cFormat.end(), '%'),
                   cFormat.end());
 
     for (size_t i = 0; i < FX_ArraySize(TbConvertTable); ++i) {
       int iStart = 0;
       int iEnd;
       while ((iEnd = cFormat.find(TbConvertTable[i].lpszJSMark, iStart)) !=
              -1) {
         cFormat.replace(iEnd, FXSYS_wcslen(TbConvertTable[i].lpszJSMark),
                         TbConvertTable[i].lpszCppMark);
         iStart = iEnd;
       }
     }
 
-    int iYear = jsDate.GetYear(pRuntime->GetIsolate());
-    int iMonth = jsDate.GetMonth(pRuntime->GetIsolate());
-    int iDay = jsDate.GetDay(pRuntime->GetIsolate());
-    int iHour = jsDate.GetHours(pRuntime->GetIsolate());
-    int iMin = jsDate.GetMinutes(pRuntime->GetIsolate());
-    int iSec = jsDate.GetSeconds(pRuntime->GetIsolate());
+    int iYear = jsDate.GetYear(pRuntime);
+    int iMonth = jsDate.GetMonth(pRuntime);
+    int iDay = jsDate.GetDay(pRuntime);
+    int iHour = jsDate.GetHours(pRuntime);
+    int iMin = jsDate.GetMinutes(pRuntime);
+    int iSec = jsDate.GetSeconds(pRuntime);
 
     TbConvertAdditional cTableAd[] = {
         {L"m", iMonth + 1}, {L"d", iDay},
         {L"H", iHour},      {L"h", iHour > 12 ? iHour - 12 : iHour},
         {L"M", iMin},       {L"s", iSec},
     };
 
     for (size_t i = 0; i < FX_ArraySize(cTableAd); ++i) {
       wchar_t tszValue[16];
       CFX_WideString sValue;
@@ skipping 39 matching lines @@
                      const std::vector<CJS_Value>& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
   CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
 
   if (params.size() < 2) {
     sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  vRet = CJS_Value(pRuntime,
-                   printx(params[0].ToCFXWideString(pRuntime->GetIsolate()),
-                          params[1].ToCFXWideString(pRuntime->GetIsolate()))
-                       .c_str());
+  vRet = CJS_Value(pRuntime, printx(params[0].ToCFXWideString(pRuntime),
+                                    params[1].ToCFXWideString(pRuntime))
+                                 .c_str());
 
   return TRUE;
 }
 
 enum CaseMode { kPreserveCase, kUpperCase, kLowerCase };
 
 static FX_WCHAR TranslateCase(FX_WCHAR input, CaseMode eMode) {
   if (eMode == kLowerCase && input >= 'A' && input <= 'Z')
     return input | 0x20;
   if (eMode == kUpperCase && input >= 'a' && input <= 'z')
@@ skipping 94 matching lines @@
 
 FX_BOOL util::scand(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();
   if (iSize < 2)
     return FALSE;
 
-  CFX_WideString sFormat = params[0].ToCFXWideString(pRuntime->GetIsolate());
-  CFX_WideString sDate = params[1].ToCFXWideString(pRuntime->GetIsolate());
+  CFX_WideString sFormat = params[0].ToCFXWideString(pRuntime);
+  CFX_WideString sDate = params[1].ToCFXWideString(pRuntime);
   double dDate = JS_GetDateTime();
   if (sDate.GetLength() > 0) {
     dDate = CJS_PublicMethods::MakeRegularDate(sDate, sFormat, nullptr);
   }
 
   if (!JS_PortIsNan(dDate)) {
-    vRet = CJS_Value(pRuntime, CJS_Date(pRuntime->GetIsolate(), dDate));
+    vRet = CJS_Value(pRuntime, CJS_Date(pRuntime, dDate));
   } else {
     vRet.SetNull(pRuntime);
   }
 
   return TRUE;
 }
 
 FX_BOOL util::byteToChar(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 = CJS_Runtime::FromContext(cc);
 
   if (params.size() < 1) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
     return FALSE;
   }
 
-  int arg = params[0].ToInt(pRuntime->GetIsolate());
+  int arg = params[0].ToInt(pRuntime);
   if (arg < 0 || arg > 255) {
     sError = JSGetStringFromID(pContext, IDS_STRING_JSVALUEERROR);
     return FALSE;
   }
 
   CFX_WideString wStr(static_cast<FX_WCHAR>(arg));
   vRet = CJS_Value(pRuntime, wStr.c_str());
   return TRUE;
 }