Replace deprecated with non-deprecated V8 APIs

fpdfsdk/src/jsapi/fxjs_v8.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 "../../../core/include/fxcrt/fx_basic.h"
 #include "../../../core/include/fxcrt/fx_ext.h" 
 #include "../../include/jsapi/fxjs_v8.h"
 #include "../../include/fsdk_define.h"
@@ skipping 87 matching lines @@
 
         CFX_WideString ws = CFX_WideString(sMethodName);
         CFX_ByteString bsMethodName = ws.UTF8Encode();
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return 0;
 
         if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return 0;
         CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
         v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate);
-        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsMethodName)), v8::FunctionTemplate::New(isolate, pMethodCall), v8::ReadOnly);
+        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsMethodName), v8::NewStringType::kNormal).ToLocalChecked(), v8::FunctionTemplate::New(isolate, pMethodCall), v8::ReadOnly);
         pObjDef->m_objTemplate.Reset(isolate,objTemp);
         return 0;
 }
 
 int JS_DefineObjProperty(IJS_Runtime* pJSRuntime, int nObjDefnID, const wchar_t* sPropName, v8::AccessorGetterCallback pPropGet, v8::AccessorSetterCallback pPropPut)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
         CFX_WideString ws = CFX_WideString(sPropName);
         CFX_ByteString bsPropertyName = ws.UTF8Encode();
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return 0;
 
         if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return 0;
         CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
         v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate);
-        objTemp->SetAccessor(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsPropertyName)), pPropGet, pPropPut);
+        objTemp->SetAccessor(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsPropertyName), v8::NewStringType::kNormal).ToLocalChecked(), pPropGet, pPropPut);
         pObjDef->m_objTemplate.Reset(isolate,objTemp);
         return 0;
 }
 
 int     JS_DefineObjAllProperties(IJS_Runtime* pJSRuntime, int nObjDefnID, v8::NamedPropertyQueryCallback pPropQurey, v8::NamedPropertyGetterCallback pPropGet, v8::NamedPropertySetterCallback pPropPut, v8::NamedPropertyDeleterCallback pPropDel)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
@@ skipping 56 matching lines @@
         CFX_ByteString bsMethodName = ws.UTF8Encode();
 
         v8::Local<v8::FunctionTemplate> funTempl = v8::FunctionTemplate::New(isolate, pMethodCall);
         v8::Local<v8::ObjectTemplate> objTemp;
 
         v8::Persistent<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime);
         if(globalObjTemp.IsEmpty())
                 objTemp = v8::ObjectTemplate::New(isolate);
         else
                 objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp);
-        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsMethodName)), funTempl, v8::ReadOnly);
+        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsMethodName), v8::NewStringType::kNormal).ToLocalChecked(), funTempl, v8::ReadOnly);
 
         globalObjTemp.Reset(isolate,objTemp);
 
         return 0;
 }
 
 int JS_DefineGlobalConst(IJS_Runtime* pJSRuntime, const wchar_t* sConstName, v8::Handle<v8::Value> pDefault)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
         CFX_WideString ws = CFX_WideString(sConstName);
         CFX_ByteString bsConst= ws.UTF8Encode();
 
         v8::Local<v8::ObjectTemplate> objTemp;
 
         v8::Persistent<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime);
         if(globalObjTemp.IsEmpty())
                 objTemp = v8::ObjectTemplate::New(isolate);
         else
                 objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp);
-        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsConst)), pDefault, v8::ReadOnly);
+        objTemp->Set(v8::String::NewFromUtf8(isolate, FX_LPCSTR(bsConst), v8::NewStringType::kNormal).ToLocalChecked(), pDefault, v8::ReadOnly);
 
         globalObjTemp.Reset(isolate,objTemp);
 
         return 0;
 }
 
 
 void JS_InitialRuntime(IJS_Runtime* pJSRuntime,IFXJS_Runtime* pFXRuntime, IFXJS_Context* context, v8::Persistent<v8::Context>& v8PersistentContext)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
         v8::HandleScope handle_scope(isolate);
 
         v8::Persistent<v8::ObjectTemplate>& globalObjTemp = _getGlobalObjectTemplate(pJSRuntime);
         v8::Handle<v8::Context> v8Context = v8::Context::New(isolate, NULL, v8::Local<v8::ObjectTemplate>::New(isolate, globalObjTemp));
         v8::Context::Scope context_scope(v8Context);
 
         v8::Handle<v8::External> ptr = v8::External::New(isolate, pFXRuntime);
         v8Context->SetEmbedderData(1, ptr);
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return;
 
         for(int i=0; i<pArray->GetSize(); i++)
         {
                 CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(i);
                 CFX_WideString ws = CFX_WideString(pObjDef->objName);
                 CFX_ByteString bs = ws.UTF8Encode();
-                v8::Handle<v8::String> objName = v8::String::NewFromUtf8(isolate, bs.c_str(), v8::String::kNormalString, bs.GetLength());
+                v8::Handle<v8::String> objName = v8::String::NewFromUtf8(isolate, bs.c_str(), v8::NewStringType::kNormal, bs.GetLength()).ToLocalChecked();
 
 
                 if(pObjDef->objType == JS_DYNAMIC)
                 {
                         //Document is set as global object, need to construct it first.
                         if(ws.Equal(L"Document"))
                         {
 
                                 CJS_PrivateData* pPrivateData = new CJS_PrivateData;
                                 pPrivateData->ObjDefID = i;
 
-                                v8Context->Global()->GetPrototype()->ToObject()->SetAlignedPointerInInternalField(0, pPrivateData);
+                                v8Context->Global()->GetPrototype()->ToObject(v8Context).ToLocalChecked()->SetAlignedPointerInInternalField(0, pPrivateData);
 
                                 if(pObjDef->m_pConstructor)
-                                        pObjDef->m_pConstructor(context, v8Context->Global()->GetPrototype()->ToObject(), v8Context->Global()->GetPrototype()->ToObject());
+                                        pObjDef->m_pConstructor(context, v8Context->Global()->GetPrototype()->ToObject(v8Context).ToLocalChecked(), v8Context->Global()->GetPrototype()->ToObject(v8Context).ToLocalChecked());
                         }
                 }
                 else
                 {
                         v8::Handle<v8::Object> obj = JS_NewFxDynamicObj(pJSRuntime, context, i);
-                        v8Context->Global()->Set(objName, obj);
+                        v8Context->Global()->Set(v8Context, objName, obj).FromJust();
                         pObjDef->m_StaticObj.Reset(isolate, obj);
                 }
         }
         v8PersistentContext.Reset(isolate, v8Context);
 }
 
 void JS_ReleaseRuntime(IJS_Runtime* pJSRuntime, v8::Persistent<v8::Context>& v8PersistentContext)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
@@ skipping 24 matching lines @@
 {
 }
 void JS_Release()
 {
 
 }
 int JS_Parse(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
-        v8::TryCatch try_catch;
+        v8::TryCatch try_catch(isolate);
 
         CFX_WideString wsScript(script);
         CFX_ByteString bsScript = wsScript.UTF8Encode();
 
 
-        v8::Handle<v8::Script> compiled_script = v8::Script::Compile(v8::String::NewFromUtf8(isolate, bsScript.c_str(), v8::String::kNormalString, bsScript.GetLength()));
-        if (compiled_script.IsEmpty()) {
+        v8::Local<v8::Context> context = isolate->GetCurrentContext();
+        v8::Local<v8::Script> compiled_script;
+        if (!v8::Script::Compile(context, v8::String::NewFromUtf8(isolate, bsScript.c_str(), v8::NewStringType::kNormal, bsScript.GetLength()).ToLocalChecked()).ToLocal(&compiled_script)) {
                 v8::String::Utf8Value error(try_catch.Exception());
                 return -1;
         }
         return 0;
 }
 
 int JS_Execute(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, const wchar_t* script, long length, FXJSErr* perror)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
-        v8::TryCatch try_catch;
+        v8::TryCatch try_catch(isolate);
 
         CFX_WideString wsScript(script);
         CFX_ByteString bsScript = wsScript.UTF8Encode();
 
-    v8::Handle<v8::Script> compiled_script = v8::Script::Compile(v8::String::NewFromUtf8(isolate, bsScript.c_str(), v8::String::kNormalString, bsScript.GetLength()));
-        if (compiled_script.IsEmpty()) {
+        v8::Local<v8::Context> context = isolate->GetCurrentContext();
+        v8::Local<v8::Script> compiled_script;
+        if (!v8::Script::Compile(context, v8::String::NewFromUtf8(isolate, bsScript.c_str(), v8::NewStringType::kNormal, bsScript.GetLength()).ToLocalChecked()).ToLocal(&compiled_script)) {
                 v8::String::Utf8Value error(try_catch.Exception());
                 return -1;
         }
 
-        v8::Handle<v8::Value> result = compiled_script->Run();
-        if (result.IsEmpty()) {
+        v8::Handle<v8::Value> result;
+        if (!compiled_script->Run(context).ToLocal(&result)) {
                 v8::String::Utf8Value error(try_catch.Exception());
                 return -1;
         }
         return 0;
 }
 
 v8::Handle<v8::Object> JS_NewFxDynamicObj(IJS_Runtime* pJSRuntime, IFXJS_Context* pJSContext, int nObjDefnID)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
+        v8::Local<v8::Context> context = isolate->GetCurrentContext();
         if(-1 == nObjDefnID)
         {
                 v8::Local<v8::ObjectTemplate> objTempl = v8::ObjectTemplate::New(isolate);
-                return objTempl->NewInstance();
+                v8::Local<v8::Object> obj;
+                if (objTempl->NewInstance(context).ToLocal(&obj)) return obj;
+                return v8::Handle<v8::Object>();
         }
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return v8::Handle<v8::Object>();
 
 
         if(nObjDefnID<0 || nObjDefnID>= pArray->GetSize()) return v8::Handle<v8::Object>();
         CJS_ObjDefintion* pObjDef = (CJS_ObjDefintion*)pArray->GetAt(nObjDefnID);
 
-        v8::Local<v8::Context> context = isolate->GetCurrentContext();
         v8::Local<v8::ObjectTemplate> objTemp = v8::Local<v8::ObjectTemplate>::New(isolate, pObjDef->m_objTemplate);
-        v8::Local<v8::Object> obj = objTemp->NewInstance();
+        v8::Local<v8::Object> obj;
+        if (!objTemp->NewInstance(context).ToLocal(&obj)) return v8::Local<v8::Object>();
 
         CJS_PrivateData* pPrivateData = new CJS_PrivateData;
         pPrivateData->ObjDefID = nObjDefnID;
 
         obj->SetAlignedPointerInInternalField(0, pPrivateData);
         if(pObjDef->m_pConstructor)
-                pObjDef->m_pConstructor(pJSContext, obj, context->Global()->GetPrototype()->ToObject());
+                pObjDef->m_pConstructor(pJSContext, obj, context->Global()->GetPrototype()->ToObject(context).ToLocalChecked());
 
         return obj;
 }
 
 v8::Handle<v8::Object> JS_GetStaticObj(IJS_Runtime* pJSRuntime, int nObjDefnID)
 {
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
@@ skipping 12 matching lines @@
 v8::Handle<v8::Object>  JS_GetThisObj(IJS_Runtime * pJSRuntime)
 {
         //Return the global object.
         v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
         v8::Isolate::Scope isolate_scope(isolate);
 
         CFX_PtrArray* pArray = (CFX_PtrArray*)isolate->GetData(0);
         if(!pArray) return v8::Handle<v8::Object>();
 
         v8::Local<v8::Context> context = isolate->GetCurrentContext();
-        return context->Global()->GetPrototype()->ToObject();
+        return context->Global()->GetPrototype()->ToObject(context).ToLocalChecked();
 }
 
 int     JS_GetObjDefnID(v8::Handle<v8::Object> pObj)
 {
         if(pObj.IsEmpty() || !pObj->InternalFieldCount()) return -1;
         CJS_PrivateData* pPrivateData = (CJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0);
         if(pPrivateData)
                 return pPrivateData->ObjDefID;
         return -1;
 }
@@ skipping 23 matching lines @@
         return -1;
 }
 
 void JS_Error(v8::Isolate* isolate, const CFX_WideString& message)
 {
     // Conversion from pdfium's wchar_t wide-strings to v8's uint16_t
     // wide-strings isn't handled by v8, so use UTF8 as a common
     // intermediate format.
     CFX_ByteString utf8_message = message.UTF8Encode();
     isolate->ThrowException(v8::String::NewFromUtf8(isolate,
-                                                    utf8_message.c_str()));
+                                                    utf8_message.c_str(),
+                                                    v8::NewStringType::kNormal).ToLocalChecked());
 }
 
 unsigned JS_CalcHash(const wchar_t* main, unsigned nLen)
 {
         return (unsigned)FX_HashCode_String_GetW(main, nLen);
 }
 
 unsigned JS_CalcHash(const wchar_t* main)
 {
         return (unsigned)FX_HashCode_String_GetW(main, FXSYS_wcslen(main));
@@ skipping 39 matching lines @@
 void* JS_GetPrivate(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj)
 {
         if(pObj.IsEmpty()) return NULL;
         CJS_PrivateData* pPrivateData  = NULL;
         if(pObj->InternalFieldCount())
                 pPrivateData = (CJS_PrivateData*)pObj->GetAlignedPointerFromInternalField(0);
         else
         {
                 //It could be a global proxy object.
                 v8::Local<v8::Value> v = pObj->GetPrototype();
+                v8::Isolate* isolate = (v8::Isolate*)pJSRuntime;
+                v8::Local<v8::Context> context = isolate->GetCurrentContext();
                 if(v->IsObject())
-                        pPrivateData = (CJS_PrivateData*)v->ToObject()->GetAlignedPointerFromInternalField(0);
+                        pPrivateData = (CJS_PrivateData*)v->ToObject(context).ToLocalChecked()->GetAlignedPointerFromInternalField(0);
         }
         if(!pPrivateData) return NULL;
         return pPrivateData->pPrivate;
 }
 
 void JS_FreePrivate(void* pPrivateData)
 {
         delete (CJS_PrivateData*)pPrivateData;
 }
 
 void JS_FreePrivate(v8::Handle<v8::Object> pObj)
 {
         if(pObj.IsEmpty() || !pObj->InternalFieldCount()) return;
         JS_FreePrivate(pObj->GetAlignedPointerFromInternalField(0));
         pObj->SetAlignedPointerInInternalField(0, NULL);
 }
 
 
 v8::Handle<v8::Value> JS_GetObjectValue(v8::Handle<v8::Object> pObj)
 {
         return pObj;
 }
 
 v8::Handle<v8::String> WSToJSString(IJS_Runtime* pJSRuntime, const wchar_t* PropertyName, int Len = -1)
 {
         CFX_WideString ws = CFX_WideString(PropertyName,Len);
         CFX_ByteString bs = ws.UTF8Encode();
         if(!pJSRuntime) pJSRuntime = v8::Isolate::GetCurrent();
-        return v8::String::NewFromUtf8(pJSRuntime, bs.c_str());
+        return v8::String::NewFromUtf8(pJSRuntime, bs.c_str(), v8::NewStringType::kNormal).ToLocalChecked();
 }
 
 v8::Handle<v8::Value> JS_GetObjectElement(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj,const wchar_t* PropertyName)
 {
         if(pObj.IsEmpty()) return v8::Handle<v8::Value>();
-        return pObj->Get(WSToJSString(pJSRuntime,PropertyName));
+        v8::Local<v8::Value> val;
+        if (!pObj->Get(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName)).ToLocal(&val)) return v8::Handle<v8::Value>();
+        return val;
 }
 
-v8::Handle<v8::Array> JS_GetObjectElementNames(v8::Handle<v8::Object> pObj)
+v8::Handle<v8::Array> JS_GetObjectElementNames(IJS_Runtime* pJSRuntime, v8::Handle<v8::Object> pObj)
 {
         if(pObj.IsEmpty()) return v8::Handle<v8::Array>();
-        return pObj->GetPropertyNames();
+        v8::Local<v8::Array> val;
+        if (!pObj->GetPropertyNames(pJSRuntime->GetCurrentContext()).ToLocal(&val)) return v8::Local<v8::Array>();
+        return val;
 }
 
 void JS_PutObjectString(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, const wchar_t* sValue) //VT_string
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime, PropertyName), WSToJSString(pJSRuntime, sValue));
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime, PropertyName), WSToJSString(pJSRuntime, sValue)).FromJust();
 }
 
 void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, int nValue)
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime,PropertyName),v8::Int32::New(pJSRuntime, nValue));
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Int32::New(pJSRuntime, nValue)).FromJust();
 }
 
 void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, float fValue)
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime,PropertyName),v8::Number::New(pJSRuntime, (double)fValue));
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Number::New(pJSRuntime, (double)fValue)).FromJust();
 }
 
 void JS_PutObjectNumber(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, double dValue)
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime,PropertyName),v8::Number::New(pJSRuntime, (double)dValue));
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Number::New(pJSRuntime, (double)dValue)).FromJust();
 }
 
 void JS_PutObjectBoolean(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, bool bValue)
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime,PropertyName),v8::Boolean::New(pJSRuntime, bValue));
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Boolean::New(pJSRuntime, bValue)).FromJust();
 }
 
 void JS_PutObjectObject(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName, v8::Handle<v8::Object> pPut)
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime,PropertyName),pPut);
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),pPut).FromJust();
 }
 
 void JS_PutObjectNull(IJS_Runtime* pJSRuntime,v8::Handle<v8::Object> pObj, const wchar_t* PropertyName)
 {
         if(pObj.IsEmpty()) return;
-        pObj->Set(WSToJSString(pJSRuntime,PropertyName),v8::Handle<v8::Object>());
+        pObj->Set(pJSRuntime->GetCurrentContext(), WSToJSString(pJSRuntime,PropertyName),v8::Handle<v8::Object>()).FromJust();
 }
 
 v8::Handle<v8::Array> JS_NewArray(IJS_Runtime* pJSRuntime)
 {
         return v8::Array::New(pJSRuntime);
 }
 
-unsigned JS_PutArrayElement(v8::Handle<v8::Array> pArray,unsigned index,v8::Handle<v8::Value> pValue,FXJSVALUETYPE eType)
+unsigned JS_PutArrayElement(IJS_Runtime* pJSRuntime, v8::Handle<v8::Array> pArray,unsigned index,v8::Handle<v8::Value> pValue,FXJSVALUETYPE eType)
 {       
         if(pArray.IsEmpty()) return 0;
-        pArray->Set(index, pValue);
+        if (pArray->Set(pJSRuntime->GetCurrentContext(), index, pValue).IsNothing()) return 0;
         return 1;
 }
 
-v8::Handle<v8::Value> JS_GetArrayElemnet(v8::Handle<v8::Array> pArray,unsigned index)
+v8::Handle<v8::Value> JS_GetArrayElement(IJS_Runtime* pJSRuntime, v8::Handle<v8::Array> pArray,unsigned index)
 {
         if(pArray.IsEmpty()) return v8::Handle<v8::Value>();
-        return pArray->Get(index);
+        v8::Local<v8::Value> val;
+        if (pArray->Get(pJSRuntime->GetCurrentContext(), index).ToLocal(&val)) return v8::Local<v8::Value>();
+        return val;
 }
 
 unsigned JS_GetArrayLength(v8::Handle<v8::Array> pArray)
 {
         if(pArray.IsEmpty()) return 0;
         return pArray->Length();
 }
 
 v8::Handle<v8::Value> JS_NewNumber(IJS_Runtime* pJSRuntime,int number)
 {
@@ skipping 38 matching lines @@
         return WSToJSString(pJSRuntime, string, nLen);
 }
 
 v8::Handle<v8::Value> JS_NewNull()
 {
         return v8::Handle<v8::Value>();
 }
 
 v8::Handle<v8::Value> JS_NewDate(IJS_Runtime* pJSRuntime,double d)
 {
-        return v8::Date::New(pJSRuntime, d);
+        return v8::Date::New(pJSRuntime->GetCurrentContext(), d).ToLocalChecked();
 }
 
 v8::Handle<v8::Value> JS_NewValue(IJS_Runtime* pJSRuntime)
 {
         return v8::Handle<v8::Value>();
 }
 
-v8::Handle<v8::Value> JS_GetListValue(v8::Handle<v8::Value> pList, int index)
+v8::Handle<v8::Value> JS_GetListValue(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pList, int index)
 {
 
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
         if(!pList.IsEmpty() && pList->IsObject())
         {
-                v8::Local<v8::Object> obj = pList->ToObject();
-                return obj->Get(index);
+                v8::Local<v8::Object> obj;
+                if (pList->ToObject(context).ToLocal(&obj))
+                {
+                        v8::Local<v8::Value> val;
+                        if (obj->Get(context, index).ToLocal(&val)) return val;
+                }
         }
         return v8::Handle<v8::Value>();
 }
 
-int     JS_ToInt32(v8::Handle<v8::Value> pValue)
+int     JS_ToInt32(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue)
 {
         if(pValue.IsEmpty()) return 0;
-        return pValue->ToInt32()->Value();
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
+        return pValue->ToInt32(context).ToLocalChecked()->Value();
 }
 
-bool JS_ToBoolean(v8::Handle<v8::Value> pValue)
+bool JS_ToBoolean(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue)
 {
         if(pValue.IsEmpty()) return false;
-        return pValue->ToBoolean()->Value();
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
+        return pValue->ToBoolean(context).ToLocalChecked()->Value();
 }
 
-double JS_ToNumber(v8::Handle<v8::Value> pValue)
+double JS_ToNumber(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue)
 {
         if(pValue.IsEmpty()) return 0.0;
-        return pValue->ToNumber()->Value();
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
+        return pValue->ToNumber(context).ToLocalChecked()->Value();
 }
 
-v8::Handle<v8::Object> JS_ToObject(v8::Handle<v8::Value> pValue)
+v8::Handle<v8::Object> JS_ToObject(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue)
 {
         if(pValue.IsEmpty()) return v8::Handle<v8::Object>();
-        return pValue->ToObject();
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
+        return pValue->ToObject(context).ToLocalChecked();
 }
 
-CFX_WideString  JS_ToString(v8::Handle<v8::Value> pValue)
+CFX_WideString  JS_ToString(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue)
 {
         if(pValue.IsEmpty()) return L"";
-        v8::String::Utf8Value s(pValue->ToString());
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
+        v8::String::Utf8Value s(pValue->ToString(context).ToLocalChecked());
         return CFX_WideString::FromUTF8(*s, s.length());
 }
 
-v8::Handle<v8::Array> JS_ToArray(v8::Handle<v8::Value> pValue)
+v8::Handle<v8::Array> JS_ToArray(IJS_Runtime* pJSRuntime, v8::Handle<v8::Value> pValue)
 {
         if(pValue.IsEmpty()) return v8::Handle<v8::Array>();
-        return v8::Handle<v8::Array>::Cast(pValue->ToObject());
+        v8::Local<v8::Context> context = pJSRuntime->GetCurrentContext();
+        return v8::Handle<v8::Array>::Cast(pValue->ToObject(context).ToLocalChecked());
 }
 
 void JS_ValueCopy(v8::Handle<v8::Value>& pTo, v8::Handle<v8::Value> pFrom)
 {
         pTo = pFrom;
 }
 
 
 //JavaScript time implement begin.
 
@@ skipping 213 matching lines @@
 
 double JS_DateParse(const wchar_t* string)
 {
         v8::Isolate* pIsolate = v8::Isolate::GetCurrent();
         v8::Isolate::Scope isolate_scope(pIsolate);
         v8::HandleScope scope(pIsolate);
 
         v8::Local<v8::Context> context = pIsolate->GetCurrentContext();
         
         //Use the built-in object method.
-        v8::Local<v8::Value> v = context->Global()->Get(v8::String::NewFromUtf8(pIsolate, "Date"));
+        v8::Local<v8::Value> v = context->Global()->Get(context, v8::String::NewFromUtf8(pIsolate, "Date", v8::NewStringType::kNormal).ToLocalChecked()).ToLocalChecked();
         if(v->IsObject())
         {
-                v8::Local<v8::Object> o = v->ToObject();
-                v = o->Get(v8::String::NewFromUtf8(pIsolate, "parse"));
+                v8::Local<v8::Object> o = v->ToObject(context).ToLocalChecked();
+                v = o->Get(context,v8::String::NewFromUtf8(pIsolate, "parse", v8::NewStringType::kNormal).ToLocalChecked()).ToLocalChecked();
                 if(v->IsFunction())
                 {
                         v8::Local<v8::Function> funC = v8::Handle<v8::Function>::Cast(v);
 
                         const int argc = 1;
                         v8::Local<v8::String> timeStr = WSToJSString(pIsolate, string);
                         v8::Handle<v8::Value> argv[argc] = {timeStr};
-                        v = funC->Call(context->Global(), argc, argv);
+                        v = funC->Call(context, context->Global(), argc, argv).ToLocalChecked();
                         if(v->IsNumber())
                         {
-                                double date =  v->ToNumber()->Value();
+                                double date =  v->ToNumber(context).ToLocalChecked()->Value();
                                 if(!_isfinite(date)) return date;
                                 return date + _getLocalTZA() + _getDaylightSavingTA(date);
                         }
 
                 }
         }
         return 0;
 }
 
 double JS_MakeDay(int nYear, int nMonth, int nDate)
@@ skipping 38 matching lines @@
 {
         return d != d;
 }
 
 double JS_LocalTime(double d)
 {
         return JS_GetDateTime() + _getDaylightSavingTA(d);
 }
 
 //JavaScript time implement End.