Merge to XFA: Wean CJS_Value off of v8::Isolate.

fpdfsdk/src/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 "util.h"
 
 #include "../../include/javascript/IJavaScript.h"
 #include "JS_Context.h"
 #include "JS_Define.h"
 #include "JS_EventHandler.h"
 #include "JS_Object.h"
 #include "JS_Runtime.h"
 #include "JS_Value.h"
 #include "PublicMethods.h"
 #include "resource.h"
 
 #if _FX_OS_ == _FX_ANDROID_
 #include <ctype.h>
 #endif
 
-static v8::Isolate* GetIsolate(IJS_Context* cc) {
-  CJS_Context* pContext = (CJS_Context*)cc;
-  ASSERT(pContext != NULL);
-
-  CJS_Runtime* pRuntime = pContext->GetJSRuntime();
-  ASSERT(pRuntime != NULL);
-
-  return pRuntime->GetIsolate();
-}
-
 BEGIN_JS_STATIC_CONST(CJS_Util)
 END_JS_STATIC_CONST()
 
 BEGIN_JS_STATIC_PROP(CJS_Util)
 END_JS_STATIC_PROP()
 
 BEGIN_JS_STATIC_METHOD(CJS_Util)
 JS_STATIC_METHOD_ENTRY(printd)
 JS_STATIC_METHOD_ENTRY(printf)
 JS_STATIC_METHOD_ENTRY(printx)
@@ skipping 141 matching lines @@
 
   c_strResult.erase(c_strResult.begin());
   vRet = c_strResult.c_str();
   return TRUE;
 }
 
 FX_BOOL util::printd(IJS_Context* cc,
                      const CJS_Parameters& params,
                      CJS_Value& vRet,
                      CFX_WideString& sError) {
-  v8::Isolate* isolate = GetIsolate(cc);
-
   int iSize = params.size();
   if (iSize < 2)
     return FALSE;
 
-  CJS_Value p1(isolate);
+  CJS_Runtime* pRuntime = CJS_Runtime::FromContext(cc);
+  CJS_Value p1(pRuntime);
   p1 = params[0];
 
   CJS_Value p2 = params[1];
-  CJS_Date jsDate(isolate);
+  CJS_Date jsDate(pRuntime);
   if (!p2.ConvertToDate(jsDate)) {
     sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT1);
     return FALSE;
   }
 
   if (!jsDate.IsValidDate()) {
     sError = JSGetStringFromID((CJS_Context*)cc, IDS_STRING_JSPRINT2);
     return FALSE;
   }
 
@@ skipping 282 matching lines @@
         cPurpose += letter;
         break;
     }
   }
 }
 
 FX_BOOL util::scand(IJS_Context* cc,
                     const CJS_Parameters& params,
                     CJS_Value& vRet,
                     CFX_WideString& sError) {
-  v8::Isolate* isolate = GetIsolate(cc);
   int iSize = params.size();
   if (iSize < 2)
     return FALSE;
 
   CFX_WideString sFormat = params[0].ToCFXWideString();
   CFX_WideString sDate = params[1].ToCFXWideString();
   double dDate = JS_GetDateTime();
   if (sDate.GetLength() > 0) {
     FX_BOOL bWrongFormat = FALSE;
     dDate = CJS_PublicMethods::MakeRegularDate(sDate, sFormat, bWrongFormat);
   }
 
   if (!JS_PortIsNan(dDate)) {
-    CJS_Date date(isolate, dDate);
-    vRet = date;
+    vRet = CJS_Date(CJS_Runtime::FromContext(cc), dDate);
   } else {
     vRet.SetNull();
   }
 
   return TRUE;
 }
 
 int64_t FX_atoi64(const char* nptr) {
   int c;         /* current char */
   int64_t total; /* current total */
@@ skipping 25 matching lines @@
   int iSize = params.size();
   if (iSize == 0)
     return FALSE;
   int nByte = params[0].ToInt();
   unsigned char cByte = (unsigned char)nByte;
   CFX_WideString csValue;
   csValue.Format(L"%c", cByte);
   vRet = csValue.c_str();
   return TRUE;
 }