More master side changes for convergence with XFA.
[pdfium.git] / fpdfsdk / src / javascript / JS_Runtime.cpp
index be11b04..34a18dc 100644 (file)
 // 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_EventHandler.h"
-#include "../../include/javascript/JS_Runtime.h"
-#include "../../include/javascript/JS_Context.h"
-#include "../../include/javascript/JS_Define.h"
-#include "../../include/javascript/JS_Object.h"
-#include "../../include/javascript/JS_Value.h"
-#include "../../include/javascript/Document.h"
-#include "../../include/javascript/app.h"
-#include "../../include/javascript/color.h"
-#include "../../include/javascript/Consts.h"
-#include "../../include/javascript/Document.h"
-#include "../../include/javascript/event.h"
-#include "../../include/javascript/Field.h"
-#include "../../include/javascript/Icon.h"
-#include "../../include/javascript/PublicMethods.h"
-#include "../../include/javascript/report.h"
-#include "../../include/javascript/util.h"
-#include "../../include/javascript/JS_GlobalData.h"
-#include "../../include/javascript/global.h"
-#include "../../include/javascript/console.h"
-
-#include <libplatform/libplatform.h>
-
-CJS_RuntimeFactory::~CJS_RuntimeFactory()
-{
-}
-
-IFXJS_Runtime*                                 CJS_RuntimeFactory::NewJSRuntime(CPDFDoc_Environment* pApp)
-{
-       if (!m_bInit)
-       {
-               JS_Initial();
-                m_platform = v8::platform::CreateDefaultPlatform();
-                v8::V8::InitializePlatform(m_platform);
-               
-               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::Release()
-{      
-       if(m_bInit)
-       {
-               //to do.Should be implemented as atom manipulation.
-               if (--m_nRef == 0)
-               {
-                       JS_Release();
-                       ReleaseGlobalData();
-                        v8::V8::ShutdownPlatform();
-                        delete m_platform;
-                        m_platform = NULL;
-                       m_bInit = FALSE;
-               }
-       }
-}
-
-void                                                   CJS_RuntimeFactory::DeleteJSRuntime(IFXJS_Runtime* pRuntime)
-{
-       if(pRuntime)
-               delete (CJS_Runtime*)pRuntime;
-}
-
-CJS_GlobalData*        CJS_RuntimeFactory::NewGlobalData(CPDFDoc_Environment* pApp)
-{
-       if (m_pGlobalData)
-       {
-               m_nGlobalDataCount++;
-               return m_pGlobalData;
-       }
-       else
-       {
-               m_nGlobalDataCount = 1;
-               m_pGlobalData = new CJS_GlobalData(pApp);
-               return m_pGlobalData;
-       }
-}
-
-void CJS_RuntimeFactory::ReleaseGlobalData()
-{
-       m_nGlobalDataCount--;
-       
-       if (m_nGlobalDataCount <= 0)
-       {
-               delete m_pGlobalData;
-               m_pGlobalData = NULL;
-       }
-}
-
-/* ------------------------------ CJS_Runtime ------------------------------ */
-
-CJS_Runtime::CJS_Runtime(CPDFDoc_Environment * pApp) : 
-       m_pApp(pApp),
-       m_pDocument(NULL),
-       m_bBlocking(FALSE),
-       m_pFieldEventPath(NULL),
-       m_bRegistered(FALSE)
-{
-       m_isolate = v8::Isolate::New();
-       //m_isolate->Enter();
-
-       InitJSObjects();
-
-       CJS_Context * pContext = (CJS_Context*)NewContext();
-       JS_InitialRuntime(*this, this, pContext, m_context);
-       ReleaseContext(pContext);
-}
-
-CJS_Runtime::~CJS_Runtime()
-{
-       for (int i=0, sz=m_ContextArray.GetSize(); i<sz; i++)
-               delete m_ContextArray.GetAt(i);
-
-       m_ContextArray.RemoveAll();
-
-       JS_ReleaseRuntime(*this, m_context);
 
-       RemoveEventsInLoop(m_pFieldEventPath);
-
-       m_pApp = NULL;
-       m_pDocument = NULL;
-       m_pFieldEventPath = NULL;
-       m_context.Reset();
-
-       //m_isolate->Exit();
-       m_isolate->Dispose();
-}
-
-FX_BOOL CJS_Runtime::InitJSObjects()
-{
-       v8::Isolate::Scope isolate_scope(GetIsolate());
-       v8::HandleScope handle_scope(GetIsolate());
-       v8::Handle<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;
-}
-
-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;
-               }
-       }
-}
-
-IFXJS_Context* CJS_Runtime::GetCurrentContext()
-{
-       if(!m_ContextArray.GetSize())
-               return NULL;
-       return m_ContextArray.GetAt(m_ContextArray.GetSize()-1);
-}
-
-void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc)
-{
-       if (m_pDocument != pReaderDoc)
-       {
-               v8::Isolate::Scope isolate_scope(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"));
-               }
-       }
-}
+// Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
-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;
-       }
-
-       //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;
-       }
-
-       //to add
-       CJS_FieldEvent* pNew = new CJS_FieldEvent;
-       pNew->sTargetName = sTargetName;
-       pNew->eEventType = eEventType;
-       pNew->pNext = NULL;
-
-       pLast->pNext = pNew;
-
-       return TRUE;
-}
+#include "JS_Runtime.h"
 
-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;
-               }
-
-               pLast = p;
-               p = p->pNext;
-       }
-
-       if (bFind)
-       {
-               RemoveEventsInLoop(p);
-
-               if (p == m_pFieldEventPath)
-                       m_pFieldEventPath = NULL;
-
-               if (pLast)
-                       pLast->pNext = NULL;
-       }
+#include "../../include/fsdk_mgr.h"  // For CPDFDoc_Environment.
+#include "../../include/javascript/IJavaScript.h"
+#include "Consts.h"
+#include "Document.h"
+#include "Field.h"
+#include "Icon.h"
+#include "JS_Context.h"
+#include "JS_Define.h"
+#include "JS_EventHandler.h"
+#include "JS_GlobalData.h"
+#include "JS_Object.h"
+#include "JS_Value.h"
+#include "PublicMethods.h"
+#include "app.h"
+#include "color.h"
+#include "console.h"
+#include "event.h"
+#include "global.h"
+#include "report.h"
+#include "util.h"
+
+// static
+void IJS_Runtime::Initialize(unsigned int slot, void* isolate) {
+  FXJS_Initialize(slot, reinterpret_cast<v8::Isolate*>(isolate));
+}
+
+// static
+IJS_Runtime* IJS_Runtime::Create(CPDFDoc_Environment* pEnv) {
+  return new CJS_Runtime(pEnv);
+}
+
+// static
+CJS_Runtime* CJS_Runtime::FromContext(const IJS_Context* cc) {
+  const CJS_Context* pContext = static_cast<const CJS_Context*>(cc);
+  return pContext->GetJSRuntime();
+}
+
+CJS_Runtime::CJS_Runtime(CPDFDoc_Environment* pApp)
+    : m_pApp(pApp),
+      m_pDocument(NULL),
+      m_bBlocking(FALSE),
+      m_isolate(NULL),
+      m_isolateManaged(false) {
+  IPDF_JSPLATFORM* pPlatform = m_pApp->GetFormFillInfo()->m_pJsPlatform;
+  if (pPlatform->version <= 2) {
+    unsigned int embedderDataSlot = 0;
+    v8::Isolate* pExternalIsolate = nullptr;
+    if (pPlatform->version == 2) {
+      pExternalIsolate = reinterpret_cast<v8::Isolate*>(pPlatform->m_isolate);
+      embedderDataSlot = pPlatform->m_v8EmbedderSlot;
+    }
+    FXJS_Initialize(embedderDataSlot, pExternalIsolate);
+  }
+  m_isolateManaged = FXJS_GetIsolate(&m_isolate);
+  if (m_isolateManaged || FXJS_GlobalIsolateRefCount() == 0)
+    DefineJSObjects();
+
+  CJS_Context* pContext = (CJS_Context*)NewContext();
+  FXJS_InitializeRuntime(GetIsolate(), this, m_context);
+  ReleaseContext(pContext);
+}
+
+CJS_Runtime::~CJS_Runtime() {
+  for (auto* obs : m_observers)
+    obs->OnDestroyed();
+
+  for (int i = 0, sz = m_ContextArray.GetSize(); i < sz; i++)
+    delete m_ContextArray.GetAt(i);
+
+  m_ContextArray.RemoveAll();
+  FXJS_ReleaseRuntime(GetIsolate(), m_context);
+
+  m_pApp = NULL;
+  m_pDocument = NULL;
+  m_context.Reset();
+
+  if (m_isolateManaged)
+    m_isolate->Dispose();
+}
+
+void CJS_Runtime::DefineJSObjects() {
+  v8::Isolate::Scope isolate_scope(GetIsolate());
+  v8::HandleScope handle_scope(GetIsolate());
+  v8::Local<v8::Context> context = v8::Context::New(GetIsolate());
+  v8::Context::Scope context_scope(context);
+
+  // The call order determines the "ObjDefID" assigned to each class.
+  // ObjDefIDs 0 - 2
+  CJS_Border::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Display::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Font::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+
+  // ObjDefIDs 3 - 5
+  CJS_Highlight::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Position::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_ScaleHow::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+
+  // ObjDefIDs 6 - 8
+  CJS_ScaleWhen::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Style::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Zoomtype::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+
+  // ObjDefIDs 9 - 11
+  CJS_App::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Color::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Console::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+
+  // ObjDefIDs 12 - 14
+  CJS_Document::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_GLOBAL);
+  CJS_Event::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Field::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
+
+  // ObjDefIDs 15 - 17
+  CJS_Global::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+  CJS_Icon::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
+  CJS_Util::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_STATIC);
+
+  // ObjDefIDs 18 - 20 (these can't fail, return void).
+  CJS_PublicMethods::DefineJSObjects(GetIsolate());
+  CJS_GlobalConsts::DefineJSObjects(this);
+  CJS_GlobalArrays::DefineJSObjects(this);
+
+  // ObjDefIDs 21 - 22.
+  CJS_TimerObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
+  CJS_PrintParamsObj::DefineJSObjects(GetIsolate(), FXJSOBJTYPE_DYNAMIC);
+}
+
+IJS_Context* CJS_Runtime::NewContext() {
+  CJS_Context* p = new CJS_Context(this);
+  m_ContextArray.Add(p);
+  return p;
+}
+
+void CJS_Runtime::ReleaseContext(IJS_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;
+    }
+  }
+}
+
+IJS_Context* CJS_Runtime::GetCurrentContext() {
+  if (!m_ContextArray.GetSize())
+    return NULL;
+  return m_ContextArray.GetAt(m_ContextArray.GetSize() - 1);
 }
 
-void CJS_Runtime::RemoveEventsInLoop(CJS_FieldEvent* pStart)
-{
-       CJS_FieldEvent* p = pStart;
-
-       while (p)
-       {
-               CJS_FieldEvent* pOld = p;
-               p = pOld->pNext;
+void CJS_Runtime::SetReaderDocument(CPDFSDK_Document* pReaderDoc) {
+  if (m_pDocument != pReaderDoc) {
+    v8::Isolate::Scope isolate_scope(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);
 
-               delete pOld;
-       }
+    m_pDocument = pReaderDoc;
+    if (pReaderDoc) {
+      v8::Local<v8::Object> pThis = FXJS_GetThisObj(GetIsolate());
+      if (!pThis.IsEmpty()) {
+        if (FXJS_GetObjDefnID(pThis) == CJS_Document::g_nObjDefnID) {
+          if (CJS_Document* pJSDocument =
+                  (CJS_Document*)FXJS_GetPrivate(GetIsolate(), pThis)) {
+            if (Document* pDocument = (Document*)pJSDocument->GetEmbedObject())
+              pDocument->AttachDoc(pReaderDoc);
+          }
+        }
+      }
+    }
+  }
 }
 
-v8::Handle<v8::Context>        CJS_Runtime::NewJSContext()
-{
-       return v8::Local<v8::Context>::New(m_isolate, m_context);
+int CJS_Runtime::Execute(IJS_Context* cc,
+                         const wchar_t* script,
+                         CFX_WideString* info) {
+  FXJSErr error = {};
+  int nRet = FXJS_Execute(m_isolate, cc, script, &error);
+  if (nRet < 0) {
+    info->Format(L"[ Line: %05d { %s } ] : %s", error.linnum - 1, error.srcline,
+                 error.message);
+  }
+  return nRet;
 }
-
-CFX_WideString ChangeObjName(const CFX_WideString& str)
-{
-       CFX_WideString sRet = str;
-       sRet.Replace((FX_LPCWSTR)L"_", (FX_LPCWSTR)L".");
-       return sRet;
-}
-
-void CJS_Runtime::GetObjectNames(CFX_WideStringArray& array)
-{
-       array.RemoveAll();
-
-       array.Add(CJS_Border::m_pClassName);
-       array.Add(CJS_Display::m_pClassName);
-       array.Add(CJS_Font::m_pClassName);
-       array.Add(CJS_Highlight::m_pClassName);
-       array.Add(CJS_Position::m_pClassName);
-       array.Add(CJS_ScaleHow::m_pClassName);
-       array.Add(CJS_ScaleWhen::m_pClassName);
-       array.Add(CJS_Style::m_pClassName);
-       array.Add(CJS_Zoomtype::m_pClassName);
-
-       array.Add(CJS_App::m_pClassName);
-       array.Add((FX_LPCWSTR)"this"); 
-       array.Add(CJS_Event::m_pClassName);     
-
-       array.Add(CJS_Global::m_pClassName);    
-       array.Add(CJS_Util::m_pClassName);
+
+bool CJS_Runtime::AddEventToSet(const FieldEvent& event) {
+  return m_FieldEventSet.insert(event).second;
 }
 
-void CJS_Runtime::GetObjectConsts(const CFX_WideString& sObjName, CFX_WideStringArray& array)
-{
-       JSConstSpec* pConsts = NULL;
-       int nSize = 0;
-
-       if (sObjName == CJS_Border::m_pClassName)
-               CJS_Border::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Display::m_pClassName)
-               CJS_Display::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Font::m_pClassName)
-               CJS_Font::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Highlight::m_pClassName)
-               CJS_Highlight::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Position::m_pClassName)
-               CJS_Position::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_ScaleHow::m_pClassName)
-               CJS_ScaleHow::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_ScaleWhen::m_pClassName)
-               CJS_ScaleWhen::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Style::m_pClassName)
-               CJS_Style::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Zoomtype::m_pClassName)
-               CJS_Zoomtype::GetConsts(pConsts, nSize);
-
-       else if (sObjName == CJS_App::m_pClassName)
-               CJS_App::GetConsts(pConsts, nSize);
-       else if (sObjName == CJS_Color::m_pClassName)
-               CJS_Color::GetConsts(pConsts, nSize);   
-
-       else if (sObjName == L"this") 
-       {
-               if (GetReaderDocument())
-                       CJS_Document::GetConsts(pConsts, nSize);
-               else 
-                       CJS_App::GetConsts(pConsts, nSize);
-       }
-
-       if (sObjName == CJS_Event::m_pClassName)
-               CJS_Event::GetConsts(pConsts, nSize);   
-       else if (sObjName == CJS_Field::m_pClassName)
-               CJS_Field::GetConsts(pConsts, nSize);   
-       else if (sObjName == CJS_Global::m_pClassName)
-               CJS_Global::GetConsts(pConsts, nSize);  
-       else if (sObjName == CJS_Util::m_pClassName)
-               CJS_Util::GetConsts(pConsts, nSize);
-
-       for (int i=0; i<nSize; i++)
-               array.Add(pConsts[i].pName);
+void CJS_Runtime::RemoveEventFromSet(const FieldEvent& event) {
+  m_FieldEventSet.erase(event);
 }
 
-void CJS_Runtime::GetObjectProps(const CFX_WideString& sObjName, CFX_WideStringArray& array)
-{
-       JSPropertySpec* pProperties = NULL;
-       int nSize = 0;
-
-       if (sObjName == CJS_App::m_pClassName)
-               CJS_App::GetProperties(pProperties, nSize);
-       else if (sObjName == CJS_Color::m_pClassName)
-               CJS_Color::GetProperties(pProperties, nSize); 
-       else if (sObjName == L"this")
-       {
-               if (GetReaderDocument())
-                       CJS_Document::GetProperties(pProperties, nSize);
-               else    
-                       CJS_App::GetProperties(pProperties, nSize);
-       }
-       else if (sObjName == CJS_Event::m_pClassName)
-               CJS_Event::GetProperties(pProperties, nSize);   
-       else if (sObjName == CJS_Field::m_pClassName)
-               CJS_Field::GetProperties(pProperties, nSize);   
-       else if (sObjName == CJS_Global::m_pClassName)
-               CJS_Global::GetProperties(pProperties, nSize);  
-       else if (sObjName == CJS_Util::m_pClassName)
-               CJS_Util::GetProperties(pProperties, nSize);
-
-       for (int i=0; i<nSize; i++)
-               array.Add(pProperties[i].pName);
+v8::Local<v8::Context> CJS_Runtime::NewJSContext() {
+  return v8::Local<v8::Context>::New(m_isolate, m_context);
 }
 
-void CJS_Runtime::GetObjectMethods(const CFX_WideString& sObjName, CFX_WideStringArray& array)
-{
-       JSMethodSpec* pMethods = NULL;
-       int nSize = 0;
-
-        if (sObjName == CJS_App::m_pClassName)
-               CJS_App::GetMethods(pMethods, nSize);
-       else if (sObjName == CJS_Color::m_pClassName)
-               CJS_Color::GetMethods(pMethods, nSize); 
-       else if (sObjName == L"this") 
-       {
-               if (GetReaderDocument())
-                       CJS_Document::GetMethods(pMethods, nSize);
-               else    
-                       CJS_App::GetMethods(pMethods, nSize);
-       }
-       else if (sObjName == CJS_Event::m_pClassName)
-               CJS_Event::GetMethods(pMethods, nSize); 
-       else if (sObjName == CJS_Field::m_pClassName)
-               CJS_Field::GetMethods(pMethods, nSize); 
-       else if (sObjName == CJS_Global::m_pClassName)
-               CJS_Global::GetMethods(pMethods, nSize);        
-       else if (sObjName == CJS_Util::m_pClassName)
-               CJS_Util::GetMethods(pMethods, nSize);
-
-       for (int i=0; i<nSize; i++)
-               array.Add(pMethods[i].pName);
+void CJS_Runtime::AddObserver(Observer* observer) {
+  ASSERT(m_observers.find(observer) == m_observers.end());
+  m_observers.insert(observer);
 }
 
-FX_BOOL  CJS_Runtime::IsEntered()
-{
-       return v8::Isolate::GetCurrent() == m_isolate;
-}
-void   CJS_Runtime::Exit()
-{
-       if(m_isolate) m_isolate->Exit();
-}
-void   CJS_Runtime::Enter()
-{
-       if(m_isolate) m_isolate->Enter();
+void CJS_Runtime::RemoveObserver(Observer* observer) {
+  ASSERT(m_observers.find(observer) != m_observers.end());
+  m_observers.erase(observer);
 }