1 files changed, 301 insertions, 305 deletions

diff --git a/fpdfsdk/src/javascript/JS_Runtime.cpp b/fpdfsdk/src/javascript/JS_Runtime.cpp
index d68b268591..7dfe326c54 100644
--- a/fpdfsdk/src/javascript/JS_Runtime.cpp
+++ b/fpdfsdk/src/javascript/JS_Runtime.cpp
@@ -29,376 +29,372 @@
 #include "../../include/fpdfxfa/fpdfxfa_app.h"
 #include "../../../xfa/src/fxjse/src/value.h"
 
-CJS_RuntimeFactory::~CJS_RuntimeFactory()
-{
-}
-
-IFXJS_Runtime*                  CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp)
-{
-	if (!m_bInit)
-	{
-		unsigned int embedderDataSlot = 0;
-		if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
-			embedderDataSlot = pApp->GetFormFillInfo()->m_pJsPlatform->m_v8EmbedderSlot;
-                }
-		JS_Initial(embedderDataSlot);
-		m_bInit = TRUE;
-	}
-	return new CJS_Runtime(pApp);
+CJS_RuntimeFactory::~CJS_RuntimeFactory() {}
+
+IFXJS_Runtime* CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp) {
+  if (!m_bInit) {
+    unsigned int embedderDataSlot = 0;
+    if (pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
+      embedderDataSlot =
+          pApp->GetFormFillInfo()->m_pJsPlatform->m_v8EmbedderSlot;
+    }
+    JS_Initial(embedderDataSlot);
+    m_bInit = TRUE;
+  }
+  return new CJS_Runtime(pApp);
 }
-void                            CJS_RuntimeFactory::AddRef()
-{
-    //to do.Should be implemented as atom manipulation.
-    m_nRef++;
+void CJS_RuntimeFactory::AddRef() {
+  // to do.Should be implemented as atom manipulation.
+  m_nRef++;
 }
-void                            CJS_RuntimeFactory::Release()
-{
-    if(m_bInit)
-    {
-        //to do.Should be implemented as atom manipulation.
-        if (--m_nRef == 0)
-        {
-            JS_Release();
-            ReleaseGlobalData();
-            m_bInit = FALSE;
-        }
+void CJS_RuntimeFactory::Release() {
+  if (m_bInit) {
+    // to do.Should be implemented as atom manipulation.
+    if (--m_nRef == 0) {
+      JS_Release();
+      ReleaseGlobalData();
+      m_bInit = FALSE;
     }
+  }
 }
 
-void                            CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime)
-{
-    delete (CJS_Runtime*)pRuntime;
+void CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime) {
+  delete (CJS_Runtime*)pRuntime;
 }
 
-CJS_GlobalData* CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp)
-{
-    if (m_pGlobalData)
-    {
-        m_nGlobalDataCount++;
-        return m_pGlobalData;
-    }
-    m_nGlobalDataCount = 1;
-    m_pGlobalData = new CJS_GlobalData(pApp);
+CJS_GlobalData* CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp) {
+  if (m_pGlobalData) {
+    m_nGlobalDataCount++;
     return m_pGlobalData;
+  }
+  m_nGlobalDataCount = 1;
+  m_pGlobalData = new CJS_GlobalData(pApp);
+  return m_pGlobalData;
 }
 
-void CJS_RuntimeFactory::ReleaseGlobalData()
-{
-    m_nGlobalDataCount--;
+void CJS_RuntimeFactory::ReleaseGlobalData() {
+  m_nGlobalDataCount--;
 
-    if (m_nGlobalDataCount <= 0)
-    {
-        delete m_pGlobalData;
-        m_pGlobalData = NULL;
-    }
+  if (m_nGlobalDataCount <= 0) {
+    delete m_pGlobalData;
+    m_pGlobalData = NULL;
+  }
 }
 
 void* CJS_ArrayBufferAllocator::Allocate(size_t length) {
-    return calloc(1, length);
+  return calloc(1, length);
 }
 
 void* CJS_ArrayBufferAllocator::AllocateUninitialized(size_t length) {
-    return malloc(length);
+  return malloc(length);
 }
 
 void CJS_ArrayBufferAllocator::Free(void* data, size_t length) {
-    free(data);
+  free(data);
 }
 
 /* ------------------------------ CJS_Runtime ------------------------------ */
-extern v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(IJS_Runtime* pJSRuntime);
-CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp) :
-	m_pApp(pApp),
-	m_pDocument(NULL),
-	m_bBlocking(FALSE),
-	m_pFieldEventPath(NULL),
-        m_isolate(NULL)
-{
-	if (CPDFXFA_App::GetInstance()->GetJSERuntime()) {
-		// TODO(tsepez): CPDFXFA_App should also use the embedder provided isolate.
-		m_isolate = (v8::Isolate*)CPDFXFA_App::GetInstance()->GetJSERuntime();
-	} else if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
-		m_isolate = reinterpret_cast<v8::Isolate*>(m_pApp->GetFormFillInfo()->m_pJsPlatform->m_isolate);
-	}
-	if (!m_isolate) {
-		m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator());
-
-		v8::Isolate::CreateParams params;
-		params.array_buffer_allocator = m_pArrayBufferAllocator.get();
-		m_isolate = v8::Isolate::New(params);
-        }
-
-	v8::Isolate* isolate = m_isolate;
-	v8::Isolate::Scope isolate_scope(isolate);
-	v8::Locker locker(isolate);
-	v8::HandleScope handle_scope(isolate);
-	if (CPDFXFA_App::GetInstance()->InitRuntime(FALSE)) {
-		CJS_Context * pContext = (CJS_Context*)NewContext();
-		JS_InitialRuntime(*this, this, pContext, m_context);
-		ReleaseContext(pContext);
-		return;
-	}
-
-    InitJSObjects();
-
-    CJS_Context * pContext = (CJS_Context*)NewContext();
+extern v8::Global<v8::ObjectTemplate>& _getGlobalObjectTemplate(
+    IJS_Runtime* pJSRuntime);
+CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
+    : m_pApp(pApp),
+      m_pDocument(NULL),
+      m_bBlocking(FALSE),
+      m_pFieldEventPath(NULL),
+      m_isolate(NULL) {
+  if (CPDFXFA_App::GetInstance()->GetJSERuntime()) {
+    // TODO(tsepez): CPDFXFA_App should also use the embedder provided isolate.
+    m_isolate = (v8::Isolate*)CPDFXFA_App::GetInstance()->GetJSERuntime();
+  } else if (m_pApp->GetFormFillInfo()->m_pJsPlatform->version >= 2) {
+    m_isolate = reinterpret_cast<v8::Isolate*>(
+        m_pApp->GetFormFillInfo()->m_pJsPlatform->m_isolate);
+  }
+  if (!m_isolate) {
+    m_pArrayBufferAllocator.reset(new CJS_ArrayBufferAllocator());
+
+    v8::Isolate::CreateParams params;
+    params.array_buffer_allocator = m_pArrayBufferAllocator.get();
+    m_isolate = v8::Isolate::New(params);
+  }
+
+  v8::Isolate* isolate = m_isolate;
+  v8::Isolate::Scope isolate_scope(isolate);
+  v8::Locker locker(isolate);
+  v8::HandleScope handle_scope(isolate);
+  if (CPDFXFA_App::GetInstance()->InitRuntime(FALSE)) {
+    CJS_Context* pContext = (CJS_Context*)NewContext();
     JS_InitialRuntime(*this, this, pContext, m_context);
     ReleaseContext(pContext);
+    return;
+  }
+
+  InitJSObjects();
+
+  CJS_Context* pContext = (CJS_Context*)NewContext();
+  JS_InitialRuntime(*this, this, pContext, m_context);
+  ReleaseContext(pContext);
 }
 
-CJS_Runtime::~CJS_Runtime()
-{
-	int size = m_ContextArray.GetSize();
-	for (int i=0;i < size; i++)
-		delete m_ContextArray.GetAt(i);
+CJS_Runtime::~CJS_Runtime() {
+  int size = m_ContextArray.GetSize();
+  for (int i = 0; i < size; i++)
+    delete m_ContextArray.GetAt(i);
 
-    m_ContextArray.RemoveAll();
+  m_ContextArray.RemoveAll();
 
-    RemoveEventsInLoop(m_pFieldEventPath);
+  RemoveEventsInLoop(m_pFieldEventPath);
 
-    m_pApp = NULL;
-    m_pDocument = NULL;
-    m_pFieldEventPath = NULL;
-    m_context.Reset();
+  m_pApp = NULL;
+  m_pDocument = NULL;
+  m_pFieldEventPath = NULL;
+  m_context.Reset();
 
-	m_isolate = NULL;
+  m_isolate = NULL;
 }
 
-FX_BOOL CJS_Runtime::InitJSObjects()
-{
-	v8::Isolate::Scope isolate_scope(GetIsolate());
-	v8::Locker locker(GetIsolate());
-	v8::HandleScope handle_scope(GetIsolate());
-	v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
-	v8::Context::Scope context_scope(context);
-	//0 - 8
-	if (CJS_Border::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Display::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Font::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Highlight::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Position::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Style::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0) return FALSE;
-
-	//9 - 11
-	if (CJS_App::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Color::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Console::Init(*this, JS_STATIC) < 0) return FALSE;
-
-	//12 - 14
-	if (CJS_Document::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-	if (CJS_Event::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Field::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-
-	//15 - 17
-	if (CJS_Global::Init(*this, JS_STATIC) < 0) return FALSE;
-	if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-	if (CJS_Util::Init(*this, JS_STATIC) < 0) return FALSE;
-
-	if (CJS_PublicMethods::Init(*this) < 0) return FALSE;
-	if (CJS_GlobalConsts::Init(*this) < 0) return FALSE;
-	if (CJS_GlobalArrays::Init(*this) < 0) return FALSE;
-
-	if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0) return FALSE;
-	if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) <0) return FALSE;
-
-	return TRUE;
+FX_BOOL CJS_Runtime::InitJSObjects() {
+  v8::Isolate::Scope isolate_scope(GetIsolate());
+  v8::Locker locker(GetIsolate());
+  v8::HandleScope handle_scope(GetIsolate());
+  v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
+  v8::Context::Scope context_scope(context);
+  // 0 - 8
+  if (CJS_Border::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Display::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Font::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Highlight::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Position::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_ScaleHow::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_ScaleWhen::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Style::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Zoomtype::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+
+  // 9 - 11
+  if (CJS_App::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Color::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Console::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+
+  // 12 - 14
+  if (CJS_Document::Init(*this, JS_DYNAMIC) < 0)
+    return FALSE;
+  if (CJS_Event::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Field::Init(*this, JS_DYNAMIC) < 0)
+    return FALSE;
+
+  // 15 - 17
+  if (CJS_Global::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+  if (CJS_Icon::Init(*this, JS_DYNAMIC) < 0)
+    return FALSE;
+  if (CJS_Util::Init(*this, JS_STATIC) < 0)
+    return FALSE;
+
+  if (CJS_PublicMethods::Init(*this) < 0)
+    return FALSE;
+  if (CJS_GlobalConsts::Init(*this) < 0)
+    return FALSE;
+  if (CJS_GlobalArrays::Init(*this) < 0)
+    return FALSE;
+
+  if (CJS_TimerObj::Init(*this, JS_DYNAMIC) < 0)
+    return FALSE;
+  if (CJS_PrintParamsObj::Init(*this, JS_DYNAMIC) < 0)
+    return FALSE;
+
+  return TRUE;
 }
 
-IFXJS_Context* CJS_Runtime::NewContext()
-{
-    CJS_Context * p = new CJS_Context(this);
-    m_ContextArray.Add(p);
-    return p;
+IFXJS_Context* CJS_Runtime::NewContext() {
+  CJS_Context* p = new CJS_Context(this);
+  m_ContextArray.Add(p);
+  return p;
 }
 
-void CJS_Runtime::ReleaseContext(IFXJS_Context * pContext)
-{
-    CJS_Context* pJSContext = (CJS_Context*)pContext;
-
-    for (int i=0, sz=m_ContextArray.GetSize(); i<sz; i++)
-    {
-        if (pJSContext == m_ContextArray.GetAt(i))
-        {
-            delete pJSContext;
-            m_ContextArray.RemoveAt(i);
-            break;
-        }
-    }
-}
+void CJS_Runtime::ReleaseContext(IFXJS_Context* pContext) {
+  CJS_Context* pJSContext = (CJS_Context*)pContext;
 
-IFXJS_Context*  CJS_Runtime::GetCurrentContext()
-{
-    if(!m_ContextArray.GetSize())
-        return NULL;
-    return m_ContextArray.GetAt(m_ContextArray.GetSize()-1);
+  for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++) {
+    if (pJSContext == m_ContextArray.GetAt(i)) {
+      delete pJSContext;
+      m_ContextArray.RemoveAt(i);
+      break;
+    }
+  }
 }
 
-void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc)
-{
-	if (m_pDocument != pReaderDoc)
-	{
-		v8::Isolate::Scope isolate_scope(m_isolate);
-		v8::Locker locker(m_isolate);
-		v8::HandleScope handle_scope(m_isolate);
-		v8::Local<v8::Context> context =v8::Local<v8::Context>::New(m_isolate, m_context);
-		v8::Context::Scope context_scope(context);
-
-		m_pDocument = pReaderDoc;
-
-		if (pReaderDoc)
-		{
-			JSObject pThis = JS_GetThisObj(*this);
-			if(!pThis.IsEmpty())
-			{
-				if (JS_GetObjDefnID(pThis) == JS_GetObjDefnID(*this, L"Document"))
-				{
-					if (CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pThis))
-					{
-						if (Document * pDocument = (Document*)pJSDocument->GetEmbedObject())
-							pDocument->AttachDoc(pReaderDoc);
-					}
-				}
-			}
-			JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"Document"));
-		}
-		else
-		{
-			JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"app"));
-		}
-	}
+IFXJS_Context* CJS_Runtime::GetCurrentContext() {
+  if (!m_ContextArray.GetSize())
+    return NULL;
+  return m_ContextArray.GetAt(m_ContextArray.GetSize() - 1);
 }
 
-FX_BOOL CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName, JS_EVENT_T eEventType)
-{
-    if (m_pFieldEventPath == NULL)
-    {
-        m_pFieldEventPath = new CJS_FieldEvent;
-        m_pFieldEventPath->sTargetName = sTargetName;
-        m_pFieldEventPath->eEventType = eEventType;
-        m_pFieldEventPath->pNext = NULL;
-
-        return TRUE;
-    }
+void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) {
+  if (m_pDocument != pReaderDoc) {
+    v8::Isolate::Scope isolate_scope(m_isolate);
+    v8::Locker locker(m_isolate);
+    v8::HandleScope handle_scope(m_isolate);
+    v8::Local<v8::Context> context =
+        v8::Local<v8::Context>::New(m_isolate, m_context);
+    v8::Context::Scope context_scope(context);
 
-    //to search
-    CJS_FieldEvent* p = m_pFieldEventPath;
-    CJS_FieldEvent* pLast = m_pFieldEventPath;
-    while (p)
-    {
-        if (p->eEventType == eEventType && p->sTargetName == sTargetName)
-            return FALSE;
+    m_pDocument = pReaderDoc;
 
-        pLast = p;
-        p = p->pNext;
+    if (pReaderDoc) {
+      JSObject pThis = JS_GetThisObj(*this);
+      if (!pThis.IsEmpty()) {
+        if (JS_GetObjDefnID(pThis) == JS_GetObjDefnID(*this, L"Document")) {
+          if (CJS_Document* pJSDocument = (CJS_Document*)JS_GetPrivate(pThis)) {
+            if (Document* pDocument = (Document*)pJSDocument->GetEmbedObject())
+              pDocument->AttachDoc(pReaderDoc);
+          }
+        }
+      }
+      JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"Document"));
+    } else {
+      JS_SetThisObj(*this, JS_GetObjDefnID(*this, L"app"));
     }
+  }
+}
 
-    //to add
-    CJS_FieldEvent* pNew = new CJS_FieldEvent;
-    pNew->sTargetName = sTargetName;
-    pNew->eEventType = eEventType;
-    pNew->pNext = NULL;
-
-    pLast->pNext = pNew;
+FX_BOOL CJS_Runtime::AddEventToLoop(const CFX_WideString& sTargetName,
+                                    JS_EVENT_T eEventType) {
+  if (m_pFieldEventPath == NULL) {
+    m_pFieldEventPath = new CJS_FieldEvent;
+    m_pFieldEventPath->sTargetName = sTargetName;
+    m_pFieldEventPath->eEventType = eEventType;
+    m_pFieldEventPath->pNext = NULL;
 
     return TRUE;
-}
+  }
 
-void CJS_Runtime::RemoveEventInLoop(const CFX_WideString& sTargetName, JS_EVENT_T eEventType)
-{
-    FX_BOOL bFind = FALSE;
-
-    CJS_FieldEvent* p = m_pFieldEventPath;
-    CJS_FieldEvent* pLast = NULL;
-    while (p)
-    {
-        if (p->eEventType == eEventType && p->sTargetName == sTargetName)
-        {
-            bFind = TRUE;
-            break;
-        }
+  // to search
+  CJS_FieldEvent* p = m_pFieldEventPath;
+  CJS_FieldEvent* pLast = m_pFieldEventPath;
+  while (p) {
+    if (p->eEventType == eEventType && p->sTargetName == sTargetName)
+      return FALSE;
 
-        pLast = p;
-        p = p->pNext;
-    }
+    pLast = p;
+    p = p->pNext;
+  }
 
-    if (bFind)
-    {
-        RemoveEventsInLoop(p);
+  // to add
+  CJS_FieldEvent* pNew = new CJS_FieldEvent;
+  pNew->sTargetName = sTargetName;
+  pNew->eEventType = eEventType;
+  pNew->pNext = NULL;
 
-        if (p == m_pFieldEventPath)
-            m_pFieldEventPath = NULL;
+  pLast->pNext = pNew;
 
-        if (pLast)
-            pLast->pNext = NULL;
-    }
+  return TRUE;
 }
 
-void CJS_Runtime::RemoveEventsInLoop(CJS_FieldEvent* pStart)
-{
-    CJS_FieldEvent* p = pStart;
-
-    while (p)
-    {
-        CJS_FieldEvent* pOld = p;
-        p = pOld->pNext;
+void CJS_Runtime::RemoveEventInLoop(const CFX_WideString& sTargetName,
+                                    JS_EVENT_T eEventType) {
+  FX_BOOL bFind = FALSE;
 
-        delete pOld;
+  CJS_FieldEvent* p = m_pFieldEventPath;
+  CJS_FieldEvent* pLast = NULL;
+  while (p) {
+    if (p->eEventType == eEventType && p->sTargetName == sTargetName) {
+      bFind = TRUE;
+      break;
     }
-}
 
-v8::Local<v8::Context>  CJS_Runtime::NewJSContext()
-{
-    return v8::Local<v8::Context>::New(m_isolate, m_context);
-}
+    pLast = p;
+    p = p->pNext;
+  }
 
-CFX_WideString ChangeObjName(const CFX_WideString& str)
-{
-    CFX_WideString sRet = str;
-    sRet.Replace(L"_", L".");
-    return sRet;
-}
-FX_BOOL	CJS_Runtime::GetHValueByName(const CFX_ByteStringC& utf8Name, FXJSE_HVALUE hValue)
-{
-	const FX_CHAR* name = utf8Name.GetCStr();
+  if (bFind) {
+    RemoveEventsInLoop(p);
 
-	v8::Locker lock(GetIsolate());
-    v8::Isolate::Scope isolate_scope(GetIsolate());
-    v8::HandleScope handle_scope(GetIsolate());
-    v8::Local<v8::Context> context =
-        v8::Local<v8::Context>::New(GetIsolate(), m_context);
-    v8::Context::Scope context_scope(context);
+    if (p == m_pFieldEventPath)
+      m_pFieldEventPath = NULL;
 
+    if (pLast)
+      pLast->pNext = NULL;
+  }
+}
 
-	//v8::Local<v8::Context> tmpCotext = v8::Local<v8::Context>::New(GetIsolate(), m_context);
-	v8::Local<v8::Value> propvalue = context->Global()->Get(v8::String::NewFromUtf8(GetIsolate(), name, v8::String::kNormalString, utf8Name.GetLength()));
+void CJS_Runtime::RemoveEventsInLoop(CJS_FieldEvent* pStart) {
+  CJS_FieldEvent* p = pStart;
 
-	if (propvalue.IsEmpty()) {
-		FXJSE_Value_SetUndefined(hValue);
-		return FALSE;
-	}
-	((CFXJSE_Value*)hValue)->ForceSetValue(propvalue);
+  while (p) {
+    CJS_FieldEvent* pOld = p;
+    p = pOld->pNext;
 
-	return TRUE;
+    delete pOld;
+  }
 }
-FX_BOOL	CJS_Runtime::SetHValueByName(const CFX_ByteStringC& utf8Name, FXJSE_HVALUE hValue)
-{
-	if (utf8Name.IsEmpty() || hValue == NULL)
-		return FALSE;
-	const FX_CHAR* name = utf8Name.GetCStr();
-	v8::Isolate* pIsolate = GetIsolate();
-	v8::Locker lock(pIsolate);
-    v8::Isolate::Scope isolate_scope(pIsolate);
-    v8::HandleScope handle_scope(pIsolate);
-    v8::Local<v8::Context> context =
-        v8::Local<v8::Context>::New(pIsolate, m_context);
-    v8::Context::Scope context_scope(context);
 
-	//v8::Local<v8::Context> tmpCotext = v8::Local<v8::Context>::New(GetIsolate(), m_context);
-	v8::Local<v8::Value> propvalue = v8::Local<v8::Value>::New(GetIsolate(),((CFXJSE_Value*)hValue)->DirectGetValue());
-	context->Global()->Set(v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString, utf8Name.GetLength()), propvalue);
+v8::Local<v8::Context> CJS_Runtime::NewJSContext() {
+  return v8::Local<v8::Context>::New(m_isolate, m_context);
+}
 
-	return TRUE;
+CFX_WideString ChangeObjName(const CFX_WideString& str) {
+  CFX_WideString sRet = str;
+  sRet.Replace(L"_", L".");
+  return sRet;
+}
+FX_BOOL CJS_Runtime::GetHValueByName(const CFX_ByteStringC& utf8Name,
+                                     FXJSE_HVALUE hValue) {
+  const FX_CHAR* name = utf8Name.GetCStr();
+
+  v8::Locker lock(GetIsolate());
+  v8::Isolate::Scope isolate_scope(GetIsolate());
+  v8::HandleScope handle_scope(GetIsolate());
+  v8::Local<v8::Context> context =
+      v8::Local<v8::Context>::New(GetIsolate(), m_context);
+  v8::Context::Scope context_scope(context);
+
+  // v8::Local<v8::Context> tmpCotext =
+  // v8::Local<v8::Context>::New(GetIsolate(), m_context);
+  v8::Local<v8::Value> propvalue =
+      context->Global()->Get(v8::String::NewFromUtf8(
+          GetIsolate(), name, v8::String::kNormalString, utf8Name.GetLength()));
+
+  if (propvalue.IsEmpty()) {
+    FXJSE_Value_SetUndefined(hValue);
+    return FALSE;
+  }
+  ((CFXJSE_Value*)hValue)->ForceSetValue(propvalue);
+
+  return TRUE;
+}
+FX_BOOL CJS_Runtime::SetHValueByName(const CFX_ByteStringC& utf8Name,
+                                     FXJSE_HVALUE hValue) {
+  if (utf8Name.IsEmpty() || hValue == NULL)
+    return FALSE;
+  const FX_CHAR* name = utf8Name.GetCStr();
+  v8::Isolate* pIsolate = GetIsolate();
+  v8::Locker lock(pIsolate);
+  v8::Isolate::Scope isolate_scope(pIsolate);
+  v8::HandleScope handle_scope(pIsolate);
+  v8::Local<v8::Context> context =
+      v8::Local<v8::Context>::New(pIsolate, m_context);
+  v8::Context::Scope context_scope(context);
+
+  // v8::Local<v8::Context> tmpCotext =
+  // v8::Local<v8::Context>::New(GetIsolate(), m_context);
+  v8::Local<v8::Value> propvalue = v8::Local<v8::Value>::New(
+      GetIsolate(), ((CFXJSE_Value*)hValue)->DirectGetValue());
+  context->Global()->Set(
+      v8::String::NewFromUtf8(pIsolate, name, v8::String::kNormalString,
+                              utf8Name.GetLength()),
+      propvalue);
+
+  return TRUE;
 }